From 63880904ec802b461089d7a7d0f36db7f0ca881d Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期二, 26 十二月 2023 11:14:46 +0800 Subject: [PATCH] mdc报警分析bug修复,加工工件算法更新 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 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 fc35524..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 @@ -132,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