用户管理部门是否包含子部门

src/main/java/org/rcisoft/sys/user/dto/QuerySysUserDTO.java

@@ -15,6 +15,9 @@ public class QuerySysUserDTO {
     @ApiModelProperty(value = "用户启用状态  0未启用  1启用")
     private String flag;
 
+    @ApiModelProperty(value = "0 包含子部门  1不包含子部门")
+    private String type;
+
     @ApiModelProperty(value = "用户角色")
     private String roleName;
 

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

@@ -77,21 +77,40 @@ public class SysUserServiceImpl implements SysUserService {
      * @return
      */
     public List<SysUser> qusers(QuerySysUserDTO dto) {
-
         //step1:调用外部接口 查询出 该部门下所有人（取id）
-        if(dto.getDept()!=null){
-            List<String> deptIds = new ArrayList<>();
-            StringBuffer stringBuffer = new StringBuffer();
-            String ids = "";
-            deptIds.add(dto.getDept());
-            Set<String> deptSets = new HashSet<String>(deptIds);
-            List<String> data = mtCotactApiRequestClient.getSubUserIdsByDeptIds(dto.getCorpId(), deptSets);
-            if(data.size() != 0){
-                dto.setUserIds(data);
-            }else{
-                dto.setUserIds(Arrays.asList(""));
+        if("0".equals(dto.getType())){                      //包含子部门
+            if(dto.getDept()!=null){
+                List<String> deptIds = new ArrayList<>();
+                deptIds.add(dto.getDept());
+                Set<String> deptSets = new HashSet<>(deptIds);
+                List<String> data = mtCotactApiRequestClient.getSubUserIdsByDeptIds(dto.getCorpId(), deptSets);
+                if(data.size() != 0){
+                    dto.setUserIds(data);
+                }else{
+                    dto.setUserIds(Arrays.asList(""));
+                }
+            }
+        }else{                                              //不包含子部门
+            if(dto.getDept()!=null){
+                List<Long> deptIds = new ArrayList<>();
+                deptIds.add(Long.parseLong(dto.getDept()));
+                List<MTGetUserByDeptIdsRspDTO> data = mtCotactApiRequestClient.userGetUserByDeptIds(dto.getCorpId(),deptIds);
+                List<String> uids = new ArrayList<>();
+                if(data != null ){
+                    for (MTGetUserByDeptIdsRspDTO uid : data) {
+                        uids.add(uid.getId());
+                    }
+                    if(uids.size() != 0){
+                        dto.setUserIds(uids);
+                    }else{
+                        dto.setUserIds(Arrays.asList(""));
+                    }
+                }else{
+                    dto.setUserIds(Arrays.asList(""));
+                }
             }
         }
+
         //step2：先查出符合条件的所有人
         List<SysUser> users = sysUserMapper.queryUsers(dto);