需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -970,6 +970,9 @@ public class UserLogic {
             userWxBean.setAppModuleJson(companyWechat.getAppModuleJson());
         }
 
+        List<WorkerImg> workerImgs = workerImgService.lambdaQuery().eq(WorkerImg::getUserId, userId).list();
+        userWxBean.setWorkerImgs(workerImgs);
+
 
         return userWxBean;
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -281,6 +281,12 @@ public class WorkerManagerLogic {
         if (!websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT.getKey()))
             throw new RemoteServiceException("状态不为待审核状态");
 
+        if (workerManagerBean.getUser().getEndTime() != null && workerManagerBean.getUser().getEndTime().before(new Date()))
+            throw new RemoteServiceException("高空证不能填入失效时间");
+
+        if (workerManagerBean.getUser().getIdCardEndTime() != null && workerManagerBean.getUser().getIdCardEndTime().before(new Date()))
+            throw new RemoteServiceException("身份证不能填入过期时间");
+
         workerManagerBean.setCreateTime(null);
 
 
@@ -623,6 +629,13 @@ public class WorkerManagerLogic {
         workerManagerBean.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
 
 
+        if (workerManagerBean.getUser().getEndTime() != null && workerManagerBean.getUser().getEndTime().before(new Date()))
+            throw new RemoteServiceException("高空证不能填入失效时间");
+
+        if (workerManagerBean.getUser().getIdCardEndTime() != null && workerManagerBean.getUser().getIdCardEndTime().before(new Date()))
+            throw new RemoteServiceException("身份证不能填入过期时间");
+
+
         WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
 
         if (!websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey()))