From aab3254e58ba8c1a5ce0772562ee3d312873028b Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 12 一月 2024 10:01:39 +0800 Subject: [PATCH] 消息提醒 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java index 6e1a082..0b5c5b2 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java @@ -80,7 +80,6 @@ * * @param equipmentId * @param validDate - * @param shiftSubId * @return */ @Override @@ -133,7 +132,7 @@ } //鏌ヨ鐝埗鐝淇℃伅 Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(equipment.getEquipmentid(), stringDates); - if (listMap.isEmpty()) { + if (listMap == null || listMap.isEmpty()) { listMap = new HashMap<>(); } List<MdcEquipmentStatisticalShiftInfo> resultList = new ArrayList<>(); -- Gitblit v1.9.3