Procházet zdrojové kódy

志愿者查看排班校验权限

wangwl před 1 měsícem
rodič
revize
d17ce5b844

+ 0 - 2
leromro-common/src/main/java/com/leromro/common/core/domain/entity/SysUser.java

@@ -68,12 +68,10 @@ public class SysUser extends BaseEntity
 
     /** 最后登录IP */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
-    @TableField(exist = false)
     private String loginIp;
 
     /** 最后登录时间 */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
-    @TableField(exist = false)
     private Date loginDate;
 
     /** 部门对象 */

+ 6 - 0
leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerWorkDateServiceImpl.java

@@ -153,6 +153,12 @@ public class VolunteerWorkDateServiceImpl extends ServiceImpl<VolunteerWorkDateM
     public R<List<VolunteerWorkDate>> getWorkDateAndTime() {
         // 获取当前用户信息
         Long userId = SecurityUtils.getUserId();
+        //判断当前用户是否已经注册了志愿者
+        List<VolunteerInfo> infos = volunteerInfoService.list(new LambdaQueryWrapper<VolunteerInfo>()
+                .eq(VolunteerInfo::getVolunteerId, userId));
+        if (CollectionUtil.isEmpty(infos)){
+            return R.fail("您还未注册为志愿者,请先注册");
+        }
         List<VolunteerWorkDate> list = this.list(new LambdaQueryWrapper<VolunteerWorkDate>()
                 .eq(VolunteerWorkDate::getVolunteerId, userId)
                 .ge(VolunteerWorkDate::getWorkDate, LocalDate.now()));