From 08bae4808c1cc00ab4ef1bf5254b3d712228be4d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 12 Oct 2024 09:27:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 b5fd9f8..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){
@@ -611,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