From 464abc652133ec6d7802004c7969711579c92a65 Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Thu, 8 Jan 2026 15:19:46 +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     | 10 ++++++----
 1 file changed, 6 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 7aed843..b8aa992 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
@@ -108,6 +108,7 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
     private WatchMonitorDataMapper watchMonitorDataMapper;
     @Autowired
     private AsyncTaskExecutor asyncTaskExecutor;
+
     //删除临时文件
     public static void delLocalFile(File file) {
         String resourceFileName = file.getName();
@@ -808,8 +809,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
     }
 
     private int departComparator(SysDepart d1, SysDepart d2) {
-        Integer order1 = d1.getDepartOrder();
-        Integer order2 = d2.getDepartOrder();
+        Integer order1 = null != d1 ? d1.getDepartOrder() : null;
+        Integer order2 = null != d2 ? d2.getDepartOrder() : null;
+
         if (ObjectUtil.isNull(order1) && ObjectUtil.isNull(order2)) {
             return 0;
         }
@@ -2436,9 +2438,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
         // 获取终端数据
         Map<String, Long> deviceCount = getDeviceCount(depart);
         // 获取指定单位共计下发终端数量
-        long totalDeviceCount = null == deviceCount.get("totalDeviceCount")?0L:deviceCount.get("totalDeviceCount");
+        long totalDeviceCount = null == deviceCount.get("totalDeviceCount") ? 0L : deviceCount.get("totalDeviceCount");
         // 获取指定单位高风险下发终端数量及共计下发终端数量
-        long weeklyDeviceCount = null==deviceCount.get("weeklyDeviceCount")?0L:deviceCount.get("weeklyDeviceCount");
+        long weeklyDeviceCount = null == deviceCount.get("weeklyDeviceCount") ? 0L : deviceCount.get("weeklyDeviceCount");
 
         // 前两周的周一时间和周末时间
         Date[] datesNo = new Date[2];