需求

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

@@ -105,6 +105,13 @@ public class WorkerManagerLogic {
         websitUserLog.setWebsitId(websitUserBean.getWebsitId());
 
         websitUserLog.insert();
+
+        if (!StringUtil.isEmpty(websitUserBean.getWorkerNumber())
+                && userService.lambdaQuery().eq(User::getWorkerNumber,websitUserBean.getWorkerNumber()).ne(User::getUserId,websitUserBean.getUserId())
+                .count() > 0
+        ){
+            throw new RemoteServiceException("账号已被使用无法激活");
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -195,6 +202,13 @@ public class WorkerManagerLogic {
 
         }
 
+        if (!StringUtil.isEmpty(websitUserBean.getWorkerNumber())
+                && userService.lambdaQuery().eq(User::getWorkerNumber,websitUserBean.getWorkerNumber()).ne(User::getUserId,websitUserBean.getUserId())
+                .count() > 0
+        ){
+            throw new RemoteServiceException("账号已被使用无法激活");
+        }
+
         WebsitUserLog websitUserLog = new WebsitUserLog();
 
         websitUserLog.setTypeText("重新入职");
@@ -264,17 +278,13 @@ public class WorkerManagerLogic {
 
 
         if (!StringUtil.isEmpty(workerManagerBean.getUser().getWorkerNumber())) {
-            if (!workerManagerBean.getWorkerNumber().equals(user.getWorkerNumber())) {
-                throw new RemoteServiceException("师傅编号已经录入不允许更改");
-            }
 
-
-            if (userService.lambdaQuery().eq(User::getWorkerNumber, workerManagerBean.getWorkerNumber())
+            if (userService.lambdaQuery().eq(User::getWorkerNumber, workerManagerBean.getUser().getWorkerNumber())
                     .ne(User::getUserId, workerManagerBean.getUserId()).count() > 0) {
 
-                if (websitUserService.lambdaQuery().eq(WebsitUser::getWorkerNumber, websitUser.getWorkerNumber())
+                if (websitUserService.lambdaQuery().eq(WebsitUser::getWorkerNumber,  workerManagerBean.getUser().getWorkerNumber())
                         .ne(WebsitUser::getUserId, workerManagerBean.getUserId())
-                        .ne(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.QUIT.getKey()).count() > 0) {
+                        .notIn(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.QUIT.getKey(),ExamineWorkerStatusEnum.STOP.getKey()).count() > 0) {
                     throw new RemoteServiceException("已有该师傅编号");
                 }