部门统计bug修复

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;
         }