更新代码

src/main/java/org/rcisoft/common/util/feignDto/MTGetUserByDeptIdsRspDTO.java

@@ -6,11 +6,15 @@ import lombok.Data;
 public class MTGetUserByDeptIdsRspDTO {
 
     /**
-     * name : 李太友
-     * imAccount : litaiyou_test
-     * avatar : http://zx-zgiot-002.oss-cn-qingdao.aliyuncs.com/image/372260ee6eb244e482f338eb376799fe.jpg
-     * accountId : 133
-     * id : 1042237477954232321
+     "name": "孙敬哲",
+     "imAccount": "sunjingzhe_test",
+     "avatar": "http://zx-zgiot-002.oss-cn-qingdao.aliyuncs.com/image/66979b7bce964cfaacd6db31dfa13fcc.jpg",
+     "accountId": "180",
+     "id": "1042237482869956610",
+     "mobile": null,
+     "email": null,
+     "isDel": "0",
+     "createAt": null
      */
 
     private String name;
@@ -22,4 +26,12 @@ public class MTGetUserByDeptIdsRspDTO {
     private String accountId;
 
     private String id;
+
+    private String mobile;
+
+    private String email;
+
+    private String isDel;
+
+    private String createAt;
 }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -30,6 +30,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
             "<if test=\"name!=null and name != ''\"> and su.name like CONCAT('%',#{name},'%') </if>" +
             "<if test=\"roleName!=null and roleName != ''\"> and sr.r_name = #{roleName}</if>" +
+            "<if test=\"dept!=null and dept != ''\"> and su.business_id in ( ${dept} )</if>" +
             "<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>")
     @ResultMap(value = "BaseResultMap")
     List<SysUser> queryUsers(QuerySysUserDTO dto);

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

@@ -7,6 +7,7 @@ import org.rcisoft.business.synchronizationtime.entity.SynchronizationTime;
 import org.rcisoft.business.synchronizationtime.service.SynchronizationTimeService;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.common.util.feignDto.GetAllRspDTO;
+import org.rcisoft.common.util.feignDto.MTGetUserByDeptIdsRspDTO;
 import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
 import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
 import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
@@ -68,12 +69,26 @@ public class SysUserServiceImpl implements SysUserService {
      * @return
      */
     public List<SysUser> qusers(QuerySysUserDTO dto) {
-        //step1：先查出符合条件的所有人（部门除外） ？？分页只查出10条数据
+        //step1:调用外部接口 查询出 该部门下所有人（取id）
+        if(dto.getDept()!=null){
+            List<Long> deptIds = new ArrayList<>();
+            StringBuffer stringBuffer = new StringBuffer();
+            String ids = "";
+            deptIds.add(Long.parseLong(dto.getDept()));
+            List<MTGetUserByDeptIdsRspDTO> data = mtCotactApiRequestClient.userGetUserByDeptIds(dto.getCorpId(), deptIds);
+            if(data != null ){
+                for (MTGetUserByDeptIdsRspDTO uid : data) {
+                    stringBuffer.append(uid.getId()+",");
+                }
+                if (!stringBuffer.toString().equals("")) {
+                    ids = stringBuffer.toString().substring(0, stringBuffer.toString().length() - 1);
+                }
+                dto.setDept(ids);
+            }
+        }
+        //step2：先查出符合条件的所有人
         List<SysUser> users = sysUserMapper.queryUsers(dto);
 
-        //step2:调用外部接口 查询出 该部门下所有人（取id）
-
-
         //step3:将符合条件的用户 加上部门和岗位字段
         List<String> list = new ArrayList<>();
         for (SysUser user : users) {
@@ -108,16 +123,6 @@ public class SysUserServiceImpl implements SysUserService {
                 }
             }
         }
-        //部门不为空时 部门条件过滤(根据部门名且不支持模糊)
-        if (dto.getDept() != null) {
-            List<SysUser> usersForDept = new ArrayList<>();
-            for (SysUser user : users) {
-                if (user.getDepart().equals(dto.getDept())) {
-                    usersForDept.add(user);
-                }
-            }
-            return usersForDept;
-        }
         return users;
     }
 
@@ -132,7 +137,7 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public int AssignRoles(String userId, String roleId) {
-
+        //超级管理员只有一个不能被分配
         List<String> adminRoleName = asList("超级管理员");
         //查询超级管理员角色的userid
         List<String> adminIds = sysUserMapper.adminId(adminRoleName);
@@ -391,7 +396,6 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public List<SysUser> test(QuerySysUserDTO dto) {
-
         return this.qusers(dto);
     }
 }