用户查询功能优化

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -297,7 +297,7 @@ public class SysUserController extends CoreBaseController{
     @ApiOperation(value="查询系统用户",notes="组合查询用户，外带分页查询(isValid = 1)")
     public ResultBean querySysUserByPager(SysUser user, Pager pager){
         try{
-            user.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+//            user.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             ListPager<SysUser> listPager = sysUserService.querySysUserByPager(user, pager);
             return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java

@@ -189,7 +189,6 @@ public class SysUserInfoController extends CoreBaseController{
     @ApiOperation(value="查询用户信息",notes="复杂查询用户信息带分页")
     public ResultBean querySysUserInfo(SysUserInfo userInfo, Pager pager){
         try{
-            userInfo.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             ListPager<SysUserInfo> listPager = sysUserInfoService.querySysUserInfo(userInfo, pager);
             return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description : 用户信息 服务
@@ -291,7 +292,7 @@ public class SysUserInfoService implements ISysUserInfoService {
                 departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department));
             }
 
-            userInfo.setDepartmentIdList(StringTool.getListString(departmentIdList));
+            userInfo.setDepartmentIdList(StringTool.getListString(departmentIdList.stream().distinct().collect(Collectors.toList())));
 
             String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo);
             pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(hqlPack));

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-
+import java.util.stream.Collectors;
 
 
 /**
@@ -333,7 +333,7 @@ public class SysUserService implements ISysUserService {
     @ApiOperation(value = "查询用户ID 集合",notes = "根据部门Id 查询用户ID集合")
     public List<Long> findSysUserIdListByDepartmentId(List<Long> idList) {
         List<Long> result = new ArrayList<>();
-        if(idList != null){
+        if(idList != null && idList.size() > 0){
             StringBuffer hqlWhere = new StringBuffer();
             HqlPack.getInPack(StringUtils.join(idList, ","), "departmentId", hqlWhere);
             List<SysRefUserDepartment> list = refUserDepartmentRDao.findByHqlWhere(hqlWhere.toString());
@@ -380,7 +380,7 @@ public class SysUserService implements ISysUserService {
         }
 
         List<Long> idList = findSysUserIdListByDepartmentId(departmentIdList);
-        user.setDepartmentIdList(StringTool.getListString(idList));
+        user.setDepartmentIdList(StringTool.getListString(idList.stream().distinct().collect(Collectors.toList())));
 
         //生成hql查询语句
         String hqlPack = CoreHqlPack.packHqlSysUser(user);