添加 Cloud 获取组织或者部门下面的人员信息功能完成

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java

@@ -120,6 +120,9 @@ public interface ISysUserInfoService {
     @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系")
     List<SysRefUserDepartment> findRefUserDepartmentByUserId(Long userId);
 
+    @ApiOperation(value = "关系查询-用户部门",notes = "根据部门或者组织集合查询用户部门关系")
+    List<SysRefUserDepartment> querySysRefUserDepartment(SysUserInfo userInfo);
+
     /**
      * 查询用户岗位关系
      * @param userId
@@ -129,6 +132,15 @@ public interface ISysUserInfoService {
     List<SysRefUserPosition> findSysRefUserPositionByUserId(Long userId);
 
     /**
+     * 根据(组织ID,部门ID,用户名称,用户工号) 查询用户信息
+     * @param info
+     * @param idList 用户ID 集合
+     * @return
+     */
+    @ApiOperation(value = "查询用户信息-",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息")
+    List<SysUserInfo> querySysUserInfoList(SysUserInfo info, List<Long> idList);
+
+    /**
      * 用户唯一校验  用户工号
      * @param no
      * @param id

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

@@ -1,10 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysOrganizeService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
@@ -20,7 +18,6 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -28,6 +25,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -51,12 +50,6 @@ public class SysUserInfoController extends CoreBaseController{
     private ISysDepartmentService departmentService;
 
     @Autowired
-    private SysOrganizeService organizeService;
-
-    @Autowired
-    private ISysFileService sysFileService;
-
-    @Autowired
     private ISysPositionService sysPositionService;
 
     @PostMapping(value="/insert")
@@ -247,6 +240,31 @@ public class SysUserInfoController extends CoreBaseController{
         }
     }
 
+    @GetMapping(value = "/query-ref-department")
+    @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
+    public ResultBean queryRefDepartment(SysUserInfo userInfo) {
+        try {
+            List<Long> idList = new ArrayList<>();
+
+            List<SysRefUserDepartment> refs = sysUserInfoService.querySysRefUserDepartment(userInfo);
+            if(refs != null && refs.size() > 0){
+                for (SysRefUserDepartment ref : refs) {
+                    idList.add(ref.getUserId());
+                }
+            }
+
+            List<SysUserInfo> result = sysUserInfoService.querySysUserInfoList(userInfo, idList);
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
     @GetMapping(value = "/find-ref-position/{userId}")
     @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
     public ResultBean findRefPosition(@PathVariable("userId") String userId) {

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

@@ -99,6 +99,8 @@ public class SysUserInfoService implements ISysUserInfoService {
                     SysRefUserDepartment ref = null;
                     for (SysDepartment department : departmentList) {
                         ref = new SysRefUserDepartment();
+                        ref.setOrganizeId(department.getOrganizeId());
+                        ref.setOrganizeNameRdd(department.getOrganizeNameRdd());
                         ref.setDepartmentId(department.getId());
                         ref.setDepartmentNameRdd(department.getName());
                         ref.setUserId(userInfo.getId());
@@ -249,7 +251,7 @@ public class SysUserInfoService implements ISysUserInfoService {
     @Override
     @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)")
     public ListPager<SysUserInfo> querySysUserInfo(SysUserInfo userInfo, Pager pager) {
-        LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager);
+        LOGGER.info("查询用户信息 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager);
         if(userInfo == null) {
             pager = PagerHelper.getPager(pager, sysUserInfoRDao.listCount());
             return new ListPager(sysUserInfoRDao.listPager(pager),pager);
@@ -267,6 +269,25 @@ public class SysUserInfoService implements ISysUserInfoService {
     }
 
     @Override
+    @ApiOperation(value = "关系查询-用户部门",notes = "根据部门或者组织集合查询用户部门关系")
+    public List<SysRefUserDepartment> querySysRefUserDepartment(SysUserInfo userInfo) {
+        if(userInfo != null){
+            StringBuffer userIdWhere = new StringBuffer();
+
+            if(userInfo.getDepartmentIdList() != null){
+                HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(),","),"departmentId", userIdWhere);
+            }
+            if(userInfo.getOrganizeIdList() != null){
+                HqlPack.getInPack( StringUtils.join(userInfo.getOrganizeIdList(),","),"organizeId",userIdWhere);
+            }
+
+            return refUserDepartmentRDao.findByHqlWhere(userIdWhere.toString());
+        }else {
+            return null;
+        }
+    }
+
+    @Override
     @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系")
     public List<SysRefUserPosition> findSysRefUserPositionByUserId(Long userId) {
         return refUserPositionRDao.findByProperty("userId",userId);
@@ -289,6 +310,15 @@ public class SysUserInfoService implements ISysUserInfoService {
     }
 
     @Override
+    @ApiOperation(value = "查询用户信息-",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息")
+    public List<SysUserInfo> querySysUserInfoList(SysUserInfo info, List<Long> idList) {
+        LOGGER.info("查询用户信息 TASK_TIME SysUserInfo:{}，List<Long> idList :{}",info,idList);
+
+        String hqlPack = CoreHqlPack.packHqlSysUserInfo(info,idList);
+        return sysUserInfoRDao.findByHqlWhere(hqlPack);
+    }
+
+    @Override
     @ApiOperation(value = "用户唯一校验  用户工号",notes = "用户唯一校验  用户工号")
     public boolean checkUserInfoByUserEmpNo(String no, long id) {
         int count;