修改web列表页查询范围不正确问题

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -1077,7 +1077,6 @@ public class BLessonServiceImpl implements BLessonService {
         String corpId = curUser.getCorpId();
         String userId = curUser.getUserId();
         //查询当前登录人有什么角色
-//        List<RoleTypeDepartDTO> roleList = sysUserMapper.queryRoleTypeByUserId(userId);
         if (roleList == null || roleList.size() < 1) {
             return new ArrayList<>();
         }
@@ -1092,16 +1091,11 @@ public class BLessonServiceImpl implements BLessonService {
                 List<String> departs = asList(StringUtils.split(role.getDeparts(), ","));
                 departIds.addAll(departs);
                 // 调用 feign 获取当前部门及子部门 --->所有人
-//                uids.addAll(Arrays.asList(new CurUser(), new CurUser()));
             }
         }
         if (!isAdmin) {
-            List<GetAllRspDTO> GetAllRspDTOList = cotactApiRequestClient.getUserByDeptIdSet(corpId, departIds);
-            if (GetAllRspDTOList != null && GetAllRspDTOList.size() > 0) {
-                for (GetAllRspDTO getAllRspDTO : GetAllRspDTOList) {
-                    uids.add(getAllRspDTO.getId());
-                }
-            }
+            List<String> userList = cotactApiRequestClient.getUserByDeptIdSet(corpId, departIds);
+            uids.addAll(userList);
         }
         //自己
         uids.add(userId);

src/main/java/org/rcisoft/common/util/outClient/MTCotactApiRequestClient.java

@@ -529,18 +529,19 @@ public class MTCotactApiRequestClient {
      * @param deptIdSet
      * @return
      */
-    public List<GetAllRspDTO> getUserByDeptIdSet(String corpId,Set<String> deptIdSet){
+    public List<String> getUserByDeptIdSet(String corpId,Set<String> deptIdSet){
         if(deptIdSet == null || deptIdSet.size() < 1){
             return new ArrayList<>();
         }
-        GetUserByDeptIdReqDTO getUserByDeptIdReqDTO = new GetUserByDeptIdReqDTO();
+        GetSubUserIdsByDeptIdsReqDTO getUserByDeptIdReqDTO = new GetSubUserIdsByDeptIdsReqDTO();
         getUserByDeptIdReqDTO.setCorpId(Long.parseLong(corpId));
         List<Long> deptIdList = new ArrayList<>();
         for (String deptId : deptIdSet) {
             deptIdList.add(Long.parseLong(deptId));
         }
         getUserByDeptIdReqDTO.setDeptIds(deptIdList);
-        return contactFeignClient.getUserByDeptIds(getUserByDeptIdReqDTO,zxClientType,zxAccountId).getData();
+//        return contactFeignClient.getUserByDeptIds(getUserByDeptIdReqDTO,zxClientType,zxAccountId).getData();
+        return contactFeignClient.getSubUserIdsByDeptIds(getUserByDeptIdReqDTO,zxClientType,zxAccountId).getData();
     }
 
     public List<FindDepartByNameDTO> deptListDeptInfoByName(String corpId,String name){