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/CtUnitService.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index 59a4abf..f7cbd97 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -315,12 +315,10 @@
List<CtUnit> ctUnitList = mapper.listAllChild(loginUser.getUnitId());
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");
+ ctDeptQueryWrapper.eq("unit_id", loginUser.getUnitId()).select("id", "unit_id", "name", "parent_id");
List<CtDept> ctDeptList = ctDeptService.list(ctDeptQueryWrapper);
- List<String> deptIdList = ctDeptList.stream().map(CtDept::getId).collect(Collectors.toList());
for(CtUnit ctUnit: ctUnitList){
SelectTermDTO unitSelectTerm = new SelectTermDTO();
@@ -329,18 +327,20 @@
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
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(true);
+ if(loginUser.getUnitId().equals(ctUnit.getId())){
+ 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(true);
- deptSelectTerms.add(deptSelectTerm);
+ deptSelectTerms.add(deptSelectTerm);
+ }
+ List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms);
+ unitSelectTerm.setChildren(depts);
}
- List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms);
- unitSelectTerm.setChildren(depts);
}
unitSelectTerms.add(unitSelectTerm);
}
--
Gitblit v1.8.0