From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/group/GroupManager.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/group/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/group/GroupManager.java
index 62644d2..3856db6 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/group/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/group/GroupManager.java
@@ -42,8 +42,18 @@
List<DicArea> list = new ArrayList<>();
list.add(area);
if (Constant.AREA_TYPE_1.equals(area.getType())) {
- List<DicArea> children = dicAreaService.listData(area.getCode(), null, null);
- if (null != children && children.size() > 0) {
+ //甯傚窞绾у埆锛屽彧鏌ヨ浼婄妬
+ List<DicArea> children = dicAreaService.listData(null, null, "654000");
+ if (null != children && !children.isEmpty()) {
+ for (DicArea child : children) {
+ if (Constant.AREA_TYPE_2.equals(child.getType())) {
+ //鍖哄幙
+ List<DicArea> childrenItem = dicAreaService.listData(child.getCode(), null, null);
+ if (null != childrenItem && !childrenItem.isEmpty()) {
+ list.addAll(childrenItem);
+ }
+ }
+ }
list.addAll(children);
}
}
@@ -59,22 +69,31 @@
*/
public List<DicArea> getAreaAndChild(String areaCode) {
- List<DicArea> areaList = dicAreaService.listData(null, null, areaCode);
- if (null == areaList || areaList.isEmpty()) {
+ DicArea area = dicAreaService.listDicAreaByCode(areaCode);
+ if (null == area) {
return null;
}
- List<DicArea> children;
- for (DicArea dicArea : areaList) {
- if (Constant.AREA_TYPE_1.equals(dicArea.getType())) {
- children = dicAreaService.listData(dicArea.getCode(), null, null);
- if (null != children && children.size() > 0) {
- dicArea.setChildren(children);
+ List<DicArea> list = new ArrayList<>();
+ if (Constant.AREA_TYPE_1.equals(area.getType())) {
+ //甯傚窞绾у埆锛屽彧鏌ヨ浼婄妬
+ List<DicArea> children = dicAreaService.listData(null, null, "654000");
+ if (null != children && !children.isEmpty()) {
+ for (DicArea child : children) {
+ if (Constant.AREA_TYPE_2.equals(child.getType())) {
+ //鍖哄幙
+ List<DicArea> childrenItem = dicAreaService.listData(child.getCode(), null, null);
+ if (null != childrenItem && !childrenItem.isEmpty()) {
+ child.setChildren(childrenItem);
+ }
+ }
}
+ area.setChildren(children);
}
- }
- return areaList;
+ }
+ list.add(area);
+ return list;
}
/**
@@ -84,7 +103,6 @@
* @return
*/
public List<Dept> getAllDept(String companyId) {
-
return deptService.listDept(null, companyId, null);
}
}
--
Gitblit v1.9.3