From fe28edcb7f292afb042e8b16f0364994b35ac7a8 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 28 Oct 2024 21:34:47 +0800
Subject: [PATCH] 1、镇街交办，选择直属部门组织优化
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 1870e34..17bb4a9 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
@@ -415,19 +415,37 @@
return result;
}else if (UserBaseConsts.UNIT_GRADE_3 == loginUnit.getUnitGrade()){
// 镇街交办
- // 查询镇街部门数组
- QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>();
- ctDeptQueryWrapper.eq("unit_id", loginUnit.getId());
- List<CtDept> deptList = ctDeptService.list(ctDeptQueryWrapper);
+ // 查询镇街的直属部门组织
List<SelectTermDTO> zjbmList = new ArrayList<>();
- for (CtDept ctDept: deptList){
+ QueryWrapper<CtUnit> zjCtUnitQueryWrapper = new QueryWrapper<>();
+ zjCtUnitQueryWrapper.eq("parent_id", loginUnit.getId())
+ .eq("unit_grade", UserBaseConsts.UNIT_GRADE_3)
+ .eq("unit_type", UserBaseConsts.UNIT_TYPE_102);
+ List<CtUnit> zjCtUnitList = mapper.selectList(zjCtUnitQueryWrapper);
+ for (CtUnit zjCtUnit: zjCtUnitList){
SelectTermDTO unitSelectTerm = new SelectTermDTO();
- unitSelectTerm.setValue(ctDept.getId());
- unitSelectTerm.setLabel(ctDept.getName());
- unitSelectTerm.setParentId(loginUnit.getId());
+ unitSelectTerm.setValue(zjCtUnit.getId());
+ unitSelectTerm.setLabel(zjCtUnit.getUnitName());
+ unitSelectTerm.setParentId(zjCtUnit.getParentId());
unitSelectTerm.setCheckable(true);
zjbmList.add(unitSelectTerm);
+
}
+
+ // 查询镇街部门数组
+// QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>();
+// ctDeptQueryWrapper.eq("unit_id", loginUnit.getId());
+// List<CtDept> deptList = ctDeptService.list(ctDeptQueryWrapper);
+// List<SelectTermDTO> zjbmList = new ArrayList<>();
+// for (CtDept ctDept: deptList){
+// SelectTermDTO unitSelectTerm = new SelectTermDTO();
+// unitSelectTerm.setValue(ctDept.getId());
+// unitSelectTerm.setLabel(ctDept.getName());
+// unitSelectTerm.setParentId(loginUnit.getId());
+// unitSelectTerm.setCheckable(true);
+// zjbmList.add(unitSelectTerm);
+// }
+
// 查询村社数组
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
ctUnitQueryWrapper.eq("parent_id", loginUnit.getId()).eq("unit_grade", UserBaseConsts.UNIT_GRADE_4);
--
Gitblit v1.8.0