瀏覽代碼

人员新增手机号判定调整

徐滕 6 天之前
父節點
當前提交
6ade9935cf
共有 1 個文件被更改,包括 18 次插入11 次删除
  1. 18 11
      src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

+ 18 - 11
src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -508,20 +508,27 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             workStaffBasicInfo.setNo(this.createNo(workStaffBasicInfo));
         }
         if (StringUtils.isBlank(workStaffBasicInfo.getUserId())) {
-            //根据手机号查询用户
-            User user = userService.findUniqueByProperty("mobile", workStaffBasicInfo.getMobile());
-            if (user == null) {
+            User user = null;
+            if(StringUtils.isBlank(workStaffBasicInfo.getMobile())){
                 //创建新的用户
                 user = this.createUser(workStaffBasicInfo);
                 userService.save(user, request);
-            } else {
-                user = UserUtils.get(user.getId());
-                this.saveUserOffice(user, workStaffBasicInfo);
-                if (workStaffBasicInfo.getCompany().getId().equals(user.getCompany().getId())) {
-                    user.setOffice(workStaffBasicInfo.getOffice());
-                    userService.updateOfficeById(user);
-                    systemService.removeSession(user);
-                    UserUtils.clearCache(user);
+            }else{
+                //根据手机号查询用户
+                user = userService.findUniqueByProperty("mobile", workStaffBasicInfo.getMobile());
+                if (user == null) {
+                    //创建新的用户
+                    user = this.createUser(workStaffBasicInfo);
+                    userService.save(user, request);
+                } else {
+                    user = UserUtils.get(user.getId());
+                    this.saveUserOffice(user, workStaffBasicInfo);
+                    if (workStaffBasicInfo.getCompany().getId().equals(user.getCompany().getId())) {
+                        user.setOffice(workStaffBasicInfo.getOffice());
+                        userService.updateOfficeById(user);
+                        systemService.removeSession(user);
+                        UserUtils.clearCache(user);
+                    }
                 }
             }
             workStaffBasicInfo.setUserId(user.getId());