bugfix

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -79,9 +79,12 @@ public class KwsUserService {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
 
-        /*4、填充用户角色、用户机构关系*/
+        /*4、填充用户角色*/
         fillUserRole(reqVo.getRoleIds(), userId, reqVo.getSystemType());
 
+        /*5、用户机构关系*/
+        fillUserDept(kwsUser.getId(), reqVo.getDeptId());
+
     }
 
     /**
@@ -152,16 +155,7 @@ public class KwsUserService {
             kwsDeptService.add(kwsDept);
 
             /*3、绑定用户机构关系*/
-            KwsUserDept kwsUserDept = new KwsUserDept();
-            kwsUserDept.setUserId(userId);
-            kwsUserDept.setDeptId(deptId);
-            kwsUserDept.setId(new IdWorker(1).nextId());
-            kwsUserDept.setRemark("");
-            kwsUserDept.setStatus(Global.NO);
-            kwsUserDept.setDelFlag(Global.NO);
-            if (kwsUserDeptDao.insert(kwsUserDept) <= 0) {
-                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
-            }
+            fillUserDept(userId, deptId);
 
             /*2、新增管理员角色*/
             EditRoleReqVo editRoleReqVo = new EditRoleReqVo();
@@ -179,6 +173,26 @@ public class KwsUserService {
         return registerResDto;
     }
 
+    /**
+     * @param userId 用户id，deptId 机构id
+     * @return
+     * @desc: 填充用户机构
+     * @author: czh
+     * @date: 2023/7/11
+     */
+    private void fillUserDept(long userId, long deptId) {
+        KwsUserDept kwsUserDept = new KwsUserDept();
+        kwsUserDept.setUserId(userId);
+        kwsUserDept.setDeptId(deptId);
+        kwsUserDept.setId(new IdWorker(1).nextId());
+        kwsUserDept.setRemark("");
+        kwsUserDept.setStatus(Global.NO);
+        kwsUserDept.setDelFlag(Global.NO);
+        if (kwsUserDeptDao.insert(kwsUserDept) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+    }
+
     /**
      * @param roleIds 角色ids，userId用户id，systemType系统类型
      * @desc: 填充用户角色