更新代码

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -187,4 +187,13 @@ public class SysUserController extends PaginationController<SysUser> {
                 userServiceImpl.queryMyName(curUser));
     }
 
+    @GetMapping("/test")
+    public Result testUser(CurUser curUser,QuerySysUserDTO dto) {
+        dto.setCorpId(curUser.getCorpId());
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                userServiceImpl.test(dto));
+    }
+
 }

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -55,4 +55,6 @@ public interface SysUserService {
     MyInfoDTO queryMyName(CurUser curUser);
 
     List<MTUserInfoRspDTO> getName(CurUser curUser);
+
+    List<SysUser> test(QuerySysUserDTO dto);
 }

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -60,7 +60,6 @@ public class SysUserServiceImpl implements SysUserService {
     public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto) {
         List<SysUser> users = this.qusers(dto);
         return users;
-
     }
 
     /**
@@ -68,8 +67,14 @@ public class SysUserServiceImpl implements SysUserService {
      * @param dto
      * @return
      */
-    public List<SysUser> qusers(QuerySysUserDTO dto){
+    public List<SysUser> qusers(QuerySysUserDTO dto) {
+        //step1：先查出符合条件的所有人（部门除外） ？？分页只查出10条数据
         List<SysUser> users = sysUserMapper.queryUsers(dto);
+
+        //step2:调用外部接口 查询出 该部门下所有人（取id）
+
+
+        //step3:将符合条件的用户 加上部门和岗位字段
         List<String> list = new ArrayList<>();
         for (SysUser user : users) {
             list.add(user.getBusinessId());
@@ -85,21 +90,25 @@ public class SysUserServiceImpl implements SysUserService {
             for (SysUser sysUser : users) {
                 for (MTUserInfoRspDTO mtUserInfoRspDTO : depart) {
                     if (sysUser.getBusinessId().equals(mtUserInfoRspDTO.getId())) {
-                        for (MTUserInfoRspDTO.DeptsBean deptsBean : mtUserInfoRspDTO.getDepts()) {
-                            for (MTUserInfoRspDTO.DeptsBean.PathBean pathBean : deptsBean.getPath()) {
-                                if (null != pathBean)
-                                    sb.append(pathBean.getName() + "-");
+                        if (mtUserInfoRspDTO.getDepts() != null) {
+                            for (MTUserInfoRspDTO.DeptsBean deptsBean : mtUserInfoRspDTO.getDepts()) {
+                                for (MTUserInfoRspDTO.DeptsBean.PathBean pathBean : deptsBean.getPath()) {
+                                    if (null != pathBean)
+                                        sb.append(pathBean.getName() + "-");
+                                }
+                                position = deptsBean.getPosition() == null ? "" : String.valueOf(deptsBean.getPosition());
                             }
-                            position = deptsBean.getPosition() == null ? "" : String.valueOf(deptsBean.getPosition());
                         }
-                        sysUser.setDepart(sb.toString().substring(0, sb.toString().length() - 1));
+                        if (!sb.toString().equals("")) {
+                            sysUser.setDepart(sb.toString().substring(0, sb.toString().length() - 1));
+                        }
                         sb = new StringBuffer();
                         sysUser.setPosition(position);
                     }
                 }
             }
         }
-        //部门不为空时 部门条件过滤
+        //部门不为空时 部门条件过滤(根据部门名且不支持模糊)
         if (dto.getDept() != null) {
             List<SysUser> usersForDept = new ArrayList<>();
             for (SysUser user : users) {
@@ -107,10 +116,9 @@ public class SysUserServiceImpl implements SysUserService {
                     usersForDept.add(user);
                 }
             }
-
             return usersForDept;
         }
-        return  users;
+        return users;
     }
 
     @Override
@@ -221,7 +229,6 @@ public class SysUserServiceImpl implements SysUserService {
                 break;
             }
         }
-
         return menus;
     }
 
@@ -355,7 +362,7 @@ public class SysUserServiceImpl implements SysUserService {
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
         mtUserInfoRspDTOList.forEach(mtUserInfoRspDTO -> {
-            if (mtUserInfoRspDTO.getId().equals(curUser.getUserId())){
+            if (mtUserInfoRspDTO.getId().equals(curUser.getUserId())) {
                 //设置部门名
                 myInfoDTO.setName(mtUserInfoRspDTO.getName());
                 myInfoDTO.setHeadPic(mtUserInfoRspDTO.getAvatar());
@@ -369,7 +376,7 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public MyInfoDTO queryMyName(CurUser curUser) {
-        return  sysUserMapper.queryMyInfo(curUser);
+        return sysUserMapper.queryMyInfo(curUser);
     }
 
     @Override
@@ -381,4 +388,10 @@ public class SysUserServiceImpl implements SysUserService {
         mtUserGetsReqDTO.setIds(list);
         return mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
     }
+
+    @Override
+    public List<SysUser> test(QuerySysUserDTO dto) {
+
+        return this.qusers(dto);
+    }
 }