From 58acc583380a1cac3f97f581dee7707e6577d448 Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Fri, 9 Jan 2026 16:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BB=9F=E8=AE=A1bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeptStatisticDataServiceImpl.java    |  8 ++++----
 .../java/org/jeecg/modules/manager/ISysCache.java     |  1 +
 .../java/org/jeecg/common/system/api/ISysBaseAPI.java |  9 +++++++++
 .../system/api/fallback/SysBaseAPIFallback.java       |  5 +++++
 .../java/org/jeecg/common/system/api/ISysBaseAPI.java |  9 +++++++++
 .../modules/api/controller/SystemApiController.java   | 11 +++++++++++
 .../modules/system/service/impl/SysBaseApiImpl.java   | 11 +++++++++++
 7 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
index b8aa992..aa59eb9 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
@@ -640,9 +640,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
 
     private DeptStatData transferData(SysDepart depart, DepartStatTransfer transfer) {
         DeptStatData deptStatData = new DeptStatData();
-        String orgCode = depart.getOrgCode();
+        String orgCode = null != depart ? depart.getOrgCode() : null;
         boolean allSecond = StrUtil.isEmpty(transfer.filter().getOrgCode());
-        boolean isSecond = orgCode.length() == 6;
+        boolean isSecond = StrUtil.isNotEmpty(orgCode) && orgCode.length() == 6;
         if (isSecond) {
             deptStatData.setOrgCode(orgCode);
             deptStatData.setOrgCodeLeaf(orgCode);
@@ -657,7 +657,7 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
             deptStatData.setOrgCode(Optional.ofNullable(transfer.secondDepart()).map(SysDepart::getOrgCode).orElse(""));
             deptStatData.setOrgCodeLeaf(orgCode);
             deptStatData.setOrgCodeName(Optional.ofNullable(transfer.secondDepart()).map(SysDepart::getDepartName).orElse(""));
-            deptStatData.setOrgCodeLeafName(depart.getDepartName());
+            deptStatData.setOrgCodeLeafName(null!=depart ? depart.getDepartName() : "");
         }
         fillWatchNums(
                 deptStatData,
@@ -802,7 +802,7 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
         } else {
             return departDeviceNumMap.keySet()
                     .stream()
-                    .map(sysCache::getDepartByOrgCode)
+                    .map(sysBaseAPI::getDepartIdsByOrgCodeNew)
                     .sorted(this::departComparator)
                     .collect(Collectors.toList());
         }
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/manager/ISysCache.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/manager/ISysCache.java
index f8bd278..a5ac6d4 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/manager/ISysCache.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/manager/ISysCache.java
@@ -14,6 +14,7 @@ public interface ISysCache {
 
     SysDepart getDepartByOrgCode(String departOrgCode);
 
+
     String getDepartIdByOrgCode(String departOrgCode);
 
     SysDepart getDepartByIdClient(String departId, boolean qh);
diff --git a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index 5b78ce3..c571368 100644
--- a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -505,6 +505,15 @@ public interface ISysBaseAPI extends CommonAPI {
     @GetMapping("/sys/api/getDepartIdsByOrgCode")
     public String getDepartIdsByOrgCode(@RequestParam("orgCode") String orgCode);
 
+    /**
+     * 22通过部门编号查询部门id
+     *
+     * @param orgCode
+     * @return
+     */
+    @GetMapping("/sys/api/getDepartIdsByOrgCodeNew")
+    public SysDepart getDepartIdsByOrgCodeNew(@RequestParam("orgCode") String orgCode);
+
     /**
      * 23查询所有部门
      *
diff --git a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
index 52bd5ae..b2ee8a7 100644
--- a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
+++ b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
@@ -295,6 +295,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
+    @Override
+    public SysDepart getDepartIdsByOrgCodeNew(String orgCode) {
+        return null;
+    }
+
     @Override
     public List<SysDepartModel> getAllSysDepart() {
         return null;
diff --git a/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index 0d8c4f8..cb58392 100644
--- a/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -20,6 +20,7 @@ import org.jeecg.common.bean.transfer.UserWeightSign;
 import org.jeecg.common.system.vo.*;
 import org.jeecg.modules.system.bean.UserEmployee;
 import org.jeecg.modules.system.entity.HealthUserEmployeeEx;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserEmergencyContact;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -255,6 +256,14 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     public String getDepartIdsByOrgCode(String orgCode);
 
+    /**
+     * 23通过部门编号查询部门id
+     *
+     * @param orgCode
+     * @return
+     */
+    public SysDepart getDepartIdsByOrgCodeNew(String orgCode);
+
     /**
      * 24查询所有部门
      *
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.java
index bab9892..340041c 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.java
@@ -521,6 +521,17 @@ public class SystemApiController {
         return sysBaseApi.getDepartIdsByOrgCode(orgCode);
     }
 
+    /**
+     * 通过部门编号查询部门id
+     *
+     * @param orgCode
+     * @return
+     */
+    @GetMapping("/getDepartIdsByOrgCodeNew")
+    public SysDepart getDepartIdsByOrgCodeNew(@RequestParam("orgCode") String orgCode) {
+        return sysBaseApi.getDepartIdsByOrgCodeNew(orgCode);
+    }
+
     /**
      * 查询所有部门
      *
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index 6045da2..5d6cca0 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -1371,6 +1371,17 @@ public class SysBaseApiImpl implements ISysBaseAPI {
         return departMapper.queryDepartIdByOrgCode(orgCode);
     }
 
+    @Override
+    public SysDepart getDepartIdsByOrgCodeNew(String orgCode) {
+        LambdaQueryWrapper<SysDepart> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDepart::getOrgCode, orgCode);
+        List<SysDepart> sysDeparts = departMapper.selectList(queryWrapper);
+        if (CollUtil.isEmpty(sysDeparts)) {
+            return null;
+        }
+        return sysDeparts.get(0);
+    }
+
     @Override
     public List<SysDepartModel> getAllSysDepart() {
         List<SysDepartModel> departModelList = new ArrayList<SysDepartModel>();