From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错，且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报，且点击上报后报错
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 edd1c18..787bcb9 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
@@ -429,7 +429,7 @@
}
// 查询村社数组
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+ ctUnitQueryWrapper.eq("parent_id", loginUnit.getId()).eq("unit_grade", UserBaseConsts.UNIT_GRADE_4);
List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
List<SelectTermDTO> csList = new ArrayList<>();
for (CtUnit ctUnit: ctUnitList){
@@ -467,7 +467,21 @@
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;
}
}
@@ -597,7 +611,7 @@
}
// 查询村社数组
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId());
+ ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId()).eq("unit_grade", UserBaseConsts.UNIT_GRADE_4);
List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
List<SelectTermDTO> csList = new ArrayList<>();
for (CtUnit ctUnit: ctUnitList){
--
Gitblit v1.8.0