From 7c3418c45926b5288b22044d60dbb12fa2c982d0 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 27 Sep 2024 18:02:40 +0800
Subject: [PATCH] 大厅登记接口优化

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 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 3ff7c64..b5fd9f8 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
@@ -467,12 +467,26 @@
             result.add(firstSelectTermDTO);
             return result;
         }else {
-            return new ArrayList<>();
+            // todo
+            QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
+            ctUnitQueryWrapper.eq("parent_id", loginUnit.getParentId());
+            List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
+            //
+            List<SelectTermDTO> unitList = new ArrayList<>();
+            for (CtUnit ctUnit: ctUnitList){
+                SelectTermDTO unitSelectTerm = new SelectTermDTO();
+                unitSelectTerm.setValue(ctUnit.getId());
+                unitSelectTerm.setLabel(ctUnit.getUnitName());
+                unitSelectTerm.setParentId(ctUnit.getParentId());
+                unitSelectTerm.setCheckable(true);
+                unitList.add(unitSelectTerm);
+            }
+            return unitList;
         }
     }
 
     /**
-     * 交办-选择组织
+     * 联合处置申请-选择组织
      * @param userId
      * @return
      */
@@ -483,11 +497,11 @@
         CtUnit loginUnit = mapper.selectById(loginUser.getUnitId());
         QueryWrapper<CtUnit> ctUnitQueryWrapper1 = new QueryWrapper<>();
         ctUnitQueryWrapper1.eq("id", loginUnit.getParentId());
-        CtUnit superiorUnit = mapper.selectOne(ctUnitQueryWrapper1);
+        CtUnit superiorUnit = mapper.selectById(loginUnit.getParentId());
         // 市级
-        if (UserBaseConsts.UNIT_GRADE_1 == loginUnit.getUnitGrade()){
+        if (UserBaseConsts.UNIT_GRADE_1 == superiorUnit.getUnitGrade()){
             QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
-            ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+            ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId());
             List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
             // 定义市直部门数组
             List<SelectTermDTO> szbmList = new ArrayList<>();
@@ -532,10 +546,10 @@
             firstSelectTermDTO.setChildren(firstChildren);
             result.add(firstSelectTermDTO);
             return result;
-        }else if (UserBaseConsts.UNIT_GRADE_2 == loginUnit.getUnitGrade()){
+        }else if (UserBaseConsts.UNIT_GRADE_2 == superiorUnit.getUnitGrade()){
             // 区级
             QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
-            ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+            ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId());
             List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
             // 定义市区直部门数组
             List<SelectTermDTO> qzbmList = new ArrayList<>();
@@ -580,24 +594,24 @@
             firstSelectTermDTO.setChildren(firstChildren);
             result.add(firstSelectTermDTO);
             return result;
-        }else if (UserBaseConsts.UNIT_GRADE_3 == loginUnit.getUnitGrade()){
+        }else if (UserBaseConsts.UNIT_GRADE_3 == superiorUnit.getUnitGrade()){
             // 镇街
             // 查询镇街部门数组
             QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>();
-            ctDeptQueryWrapper.eq("unit_id", loginUnit.getId());
+            ctDeptQueryWrapper.eq("unit_id", superiorUnit.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.setParentId(superiorUnit.getId());
                 unitSelectTerm.setCheckable(true);
                 zjbmList.add(unitSelectTerm);
             }
             // 查询村社数组
             QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
-            ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+            ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId());
             List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
             List<SelectTermDTO> csList = new ArrayList<>();
             for (CtUnit ctUnit: ctUnitList){
@@ -611,10 +625,6 @@
             // 封装返回数据
             List<SelectTermDTO> result = new ArrayList<>();
             // 创建第一级
-            SelectTermDTO firstSelectTermDTO = new SelectTermDTO();
-            firstSelectTermDTO.setValue(loginUser.getUnitId());
-            firstSelectTermDTO.setLabel(loginUser.getUnitName());
-            firstSelectTermDTO.setCheckable(false);
             List<SelectTermDTO> firstChildren = new ArrayList<>();
             // 村社
             SelectTermDTO zjbmSelectTermDTO = new SelectTermDTO();
@@ -631,8 +641,7 @@
             csSelectTermDTO.setChildren(csList);
             firstChildren.add(csSelectTermDTO);
             // 第一级子级
-            firstSelectTermDTO.setChildren(firstChildren);
-            result.add(firstSelectTermDTO);
+            result.addAll(firstChildren);
             return result;
         }else {
             return new ArrayList<>();

--
Gitblit v1.8.0