From 633f9cd457a822d6b67b71d2f844c4bed4220c7f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 29 一月 2026 10:09:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index d5cf8b1..bd051f9 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -135,7 +135,7 @@
List<GroupDeptData> list = new ArrayList<>();
GroupDeptData deptData;
- List<Dept> deptList = deptService.getDeptData();
+ List<Dept> deptList = deptService.getDeptByUserType(null);
if (null != deptList && !deptList.isEmpty()) {
List<Depot> depotList;
for (Dept dept : deptList) {
@@ -225,7 +225,7 @@
indexData.setCompanyNum(companyNum);
//搴撳尯鏁�
- List<Dept> deptList = deptService.listDept(null, param.getCompanyId(), null);
+ List<Dept> deptList = deptService.getDeptByUserType(null);
if (null != deptList) {
indexData.setDeptNum(deptList.size());
}
@@ -286,7 +286,7 @@
List<GroupDeptData> list = new ArrayList<>();
GroupDeptData deptData;
- List<Dept> deptList = deptService.getDeptData();
+ List<Dept> deptList = deptService.getDeptByUserType(null);
if (null != deptList && !deptList.isEmpty()) {
List<Depot> depotList;
for (Dept dept : deptList) {
@@ -379,7 +379,7 @@
namePieChart.put(dicArea.getCode(), dicArea.getName());
}
}
- List<Dept> deptList = deptService.getDeptData();
+ List<Dept> deptList = deptService.getDeptByUserType(null);
if (null != deptList && !deptList.isEmpty()) {
//搴撳尯鎬绘暟
groupGisData.setDeptNum(deptList.size());
--
Gitblit v1.9.3