From f0ee71145111bc6ef12c1990fd44d02e688ca31f Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 10 Sep 2024 22:54:20 +0800
Subject: [PATCH] 办理部门和申请部门查询修改 查询人、组织接口修改
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java | 115 +++++++++++++++++++++------------------------------------
1 files changed, 43 insertions(+), 72 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
index 08bd4a3..941365f 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
@@ -594,12 +594,12 @@
/**
* 根据部门和角色查询
- * @param deptIdList 部门编号
+ * @param unitId 组织编号
* @param roleCode 角色代码
* @return List<SelectTermDTO>
*/
- public List<CtUser> listUserByDeptRoleList(List<String> deptIdList, String roleCode){
- return mapper.listUserByDeptRoleList(deptIdList, roleCode);
+ public List<CtUser> listUserByDeptRoleList(String unitId, String roleCode){
+ return mapper.listUserByUnitRoleList(unitId, roleCode);
}
/**
@@ -609,84 +609,55 @@
* @param roleCode 条件
* @return Page
*/
- public List<SelectTermDTO> userChoose(String userId, String roleCode) {
- // 获取当前登录用户
- CtUserDTO loginUser = clientGetUserAll(userId);
- // 组织条件
- QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- if (RoleBaseEnum.checkAdminPower(loginUser)){
- ctUnitQueryWrapper.eq("cust_id", loginUser.getCustId()).select("id", "unit_name", "parent_id");
- }else {
- ctUnitQueryWrapper.eq("id", loginUser.getUnitId()).select("id", "unit_name", "parent_id");
- }
- List<CtUnit> ctUnitList = ctUnitService.list(ctUnitQueryWrapper);
- List<SelectTermDTO> unitSelectTerms = new ArrayList<>();
+ public SelectTermDTO userChoose(String userId, String roleCode) {
+ try {
+ // 获取当前登录用户
+ CtUserDTO loginUser = clientGetUserAll(userId);
+ List<SelectTermDTO> unitSelectTerms = new ArrayList<>();
- List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList());
- // 部门条件
- QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>();
- ctDeptQueryWrapper.in("unit_id", unitIdList).select("id", "unit_id", "name", "parent_id");
- List<CtDept> ctDeptList = ctDeptService.list(ctDeptQueryWrapper);
- List<String> deptIdList = ctDeptList.stream().map(CtDept::getId).collect(Collectors.toList());
+ // 人员条件
+ List<CtUser> ctUsers = null;
+ if (StringUtils.isNotEmpty(roleCode)){
+ ctUsers = listUserByDeptRoleList(loginUser.getUnitId(), roleCode);
+ }else {
+ QueryWrapper<CtUser> ctUserQueryWrapper = new QueryWrapper<>();
+ ctUserQueryWrapper.in("unit_id", loginUser.getUnitId()).select("id", "true_name", "dept_id");
+ ctUsers = this.list(ctUserQueryWrapper);
+ }
+ List<String> userIdList = ctUsers.stream().map(CtUser::getId).collect(Collectors.toList());
+ QueryWrapper<CtUserole> ctUserQueryWrapper = new QueryWrapper<>();
+ ctUserQueryWrapper.in("user_id", userIdList).select("user_id", "role_name");
+ List<CtUserole> roleList = ctUseroleService.list(ctUserQueryWrapper);
- // 人员条件
- List<CtUser> ctUsers = null;
- if (StringUtils.isNotEmpty(roleCode)){
- ctUsers = listUserByDeptRoleList(deptIdList, roleCode);
- }else {
- QueryWrapper<CtUser> ctUserQueryWrapper = new QueryWrapper<>();
- ctUserQueryWrapper.in("dept_id", deptIdList).select("id", "true_name", "dept_id");
- ctUsers = this.list(ctUserQueryWrapper);
- }
- List<String> userIdList = ctUsers.stream().map(CtUser::getId).collect(Collectors.toList());
- QueryWrapper<CtUserole> ctUserQueryWrapper = new QueryWrapper<>();
- ctUserQueryWrapper.in("user_id", userIdList).select("user_id", "role_name");
- List<CtUserole> roleList = ctUseroleService.list(ctUserQueryWrapper);
-
- for(CtUnit ctUnit: ctUnitList){
SelectTermDTO unitSelectTerm = new SelectTermDTO();
- unitSelectTerm.setValue(ctUnit.getId());
- unitSelectTerm.setLabel(ctUnit.getUnitName());
- unitSelectTerm.setParentId(ctUnit.getParentId());
+ unitSelectTerm.setValue(loginUser.getUnitId());
+ unitSelectTerm.setLabel(loginUser.getUnitName());
unitSelectTerm.setCheckable(false);
List<SelectTermDTO> deptSelectTerms = new ArrayList<>();
- for(CtDept ctDept : ctDeptList){
- if(ctUnit.getId().equals(ctDept.getUnitId())){
- SelectTermDTO deptSelectTerm = new SelectTermDTO();
- deptSelectTerm.setValue(ctDept.getId());
- deptSelectTerm.setLabel(ctDept.getName());
- deptSelectTerm.setParentId(ctDept.getParentId());
- deptSelectTerm.setCheckable(false);
-
- if (CollectionUtils.isNotEmpty(ctUsers)) {
- List<SelectTermDTO> userSelectTerms = new ArrayList<>();
-
- for(CtUser ctUser : ctUsers){
- if(ctUser.getDeptId().equals(ctDept.getId())){
- List<CtUserole> ctUseroleList = new ArrayList<>();
- for(CtUserole ctUserole: roleList){
- if(ctUser.getId().equals(ctUserole.getUserId())){
- ctUseroleList.add(ctUserole);
- }
- }
- SelectTermDTO userSelectTerm = new SelectTermDTO();
- userSelectTerm.setValue(ctUser.getId());
- userSelectTerm.setCheckable(true);
- String roleName = ctUseroleList.stream().map(CtUserole::getRoleName).collect(Collectors.joining(","));
- userSelectTerm.setLabel(ctUser.getTrueName()+"（"+roleName+"）");
- userSelectTerms.add(userSelectTerm);
- }
+ if (CollectionUtils.isNotEmpty(ctUsers)) {
+ List<SelectTermDTO> userSelectTerms = new ArrayList<>();
+ for(CtUser ctUser : ctUsers){
+ List<CtUserole> ctUseroleList = new ArrayList<>();
+ for(CtUserole ctUserole: roleList){
+ if(ctUser.getId().equals(ctUserole.getUserId())){
+ ctUseroleList.add(ctUserole);
}
- List<SelectTermDTO> users = SelectTermUtils.createTreeByRoot(userSelectTerms);
- deptSelectTerm.setChildren(users);
}
- deptSelectTerms.add(deptSelectTerm);
+ SelectTermDTO userSelectTerm = new SelectTermDTO();
+ userSelectTerm.setValue(ctUser.getId());
+ userSelectTerm.setCheckable(true);
+ String roleName = ctUseroleList.stream().map(CtUserole::getRoleName).collect(Collectors.joining(","));
+ userSelectTerm.setLabel(ctUser.getTrueName()+"（"+roleName+"）");
+ userSelectTerms.add(userSelectTerm);
+
}
- List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms);
- unitSelectTerm.setChildren(depts);
+ List<SelectTermDTO> users = SelectTermUtils.createTreeByRoot(userSelectTerms);
+ unitSelectTerm.setChildren(users);
}
- unitSelectTerms.add(unitSelectTerm);
+ return unitSelectTerm;
+ }catch (Exception e) {
+ log.error("[CtUserService.userChoose]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CtUserService.userChoose", e);
}
- return SelectTermUtils.createTreeByFirst(unitSelectTerms, loginUser.getUnitId());
}
}
--
Gitblit v1.8.0