From 551eaf50fb8aaf2821ca17c9456ad8637da9749a Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 21 Nov 2025 17:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E8=A1=A8=E9=83=A8=E9=97=A8=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=E9=BB=98=E8=AE=A4=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java | 4 ++-- .../watch/service/impl/DeptStatisticDataServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java index a9ac196..872659f 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java @@ -5,6 +5,6 @@ import lombok.Data; @Data public class DeptAssignedUserNumsRes { - private Integer assignedUserNums; - private Integer undistributed; + private Integer assignedUserNums=0; + private Integer undistributed=0; } 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 c574748..7aed843 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 @@ -2436,9 +2436,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl deviceCount = getDeviceCount(depart); // 获取指定单位共计下发终端数量 - Long totalDeviceCount = deviceCount.get("totalDeviceCount"); + long totalDeviceCount = null == deviceCount.get("totalDeviceCount")?0L:deviceCount.get("totalDeviceCount"); // 获取指定单位高风险下发终端数量及共计下发终端数量 - Long weeklyDeviceCount = deviceCount.get("weeklyDeviceCount"); + long weeklyDeviceCount = null==deviceCount.get("weeklyDeviceCount")?0L:deviceCount.get("weeklyDeviceCount"); // 前两周的周一时间和周末时间 Date[] datesNo = new Date[2];