用户信息通过审批时，导致管理部门数据消失

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -264,6 +264,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             }
 
             @Override
+            public String getManageOfficeIdsById(String id) {
+                return null;
+            }
+
+            @Override
             public List<UserDTO> getOnLineUserList(String loginName, String tenantId) {
                 return null;
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -390,6 +390,8 @@ public interface IUserApi {
     @GetMapping(value = BASE_URL + "/selectByMobile")
     UserDTO selectByMobile(@RequestParam(value = "mobilePhone")String mobilePhone);
 
+    @GetMapping(value = BASE_URL + "/getManageOfficeIdsById")
+    String getManageOfficeIdsById(@RequestParam(value = "id")String id);
 
 
     /**

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -1487,34 +1487,16 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 TenantDTO tenantDTO = new TenantDTO();
                 tenantDTO.setId(officeDTO.getTenantId());
                 dto1.setTenantDTO(tenantDTO);
-//                if (null != officeDTO) {
-//                    Map<String,String> keyMap = new HashMap<>();
-//                    TenantDTO tenantDTO = new TenantDTO();
-//                    tenantDTO.setId(officeDTO.getTenantId());
-//                    dto1.setTenantDTO(tenantDTO);
-//                    if (officeDTO.getTenantId().equals("10003")){
-//                        keyMap.put("name", "兴光会计员工,共有权限（会计）");
-//                        keyMap.put("tenantId", officeDTO.getTenantId());
-//                        roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
-//                    }else if (officeDTO.getTenantId().equals("10004")) {
-//                        keyMap.put("name", "中审员工,共有权限（中审）");
-//                        keyMap.put("tenantId", officeDTO.getTenantId());
-//                        roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
-//                    }else if (officeDTO.getTenantId().equals("10001")) {
-//                        keyMap.put("name", "评估员工,共有权限（评估）");
-//                        keyMap.put("tenantId", officeDTO.getTenantId());
-//                        roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
-//                    }
-//                } else {
-//                    TenantDTO tenantDTO = new TenantDTO();
-//                    tenantDTO.setId("10002");
-//                    dto1.setTenantDTO(tenantDTO);
-//                }
+                //根据用户id查询其管理部门的id并插入
+                if (null != reportData && StringUtils.isNotBlank(reportData.getId())) {
+                    String manageOfficeIdsById = SpringUtil.getBean(IUserApi.class).getManageOfficeIdsById(reportData.getUserId());
+                    if (StringUtils.isNotBlank(manageOfficeIdsById)) {
+                        dto1.setManageOfficeIds(manageOfficeIdsById);
+                    }
+                }
                 dto1.setRoleDTOList(roleIdList);
                 dto1.setPostDTOList(postDTOList);
                 SpringUtil.getBean(IUserApi.class).saveOrUpdate(dto1);
-
-
             }
         }
 

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -316,6 +316,12 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public String getManageOfficeIdsById(String id) {
+        return userService.getManageOfficeIdsById(id);
+    }
+
+
+    @Override
     public List<UserDTO> getOnLineUserList(String loginName, String tenantId) {
         return userService.getOnLineUserList ( loginName, tenantId );
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -873,6 +873,11 @@ public class UserService extends ServiceImpl<UserMapper, User> {
         return userMapper.selectByMobile(mobilePhone);
     }
 
+    public String getManageOfficeIdsById(String id) {
+        return userMapper.getManageOfficeIdsById(id);
+    }
+
+
     /**
      * 根据登录名和对应租户id查询登陆人员信息
      * @param loginNanme