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/MdcEquipmentRunningSectionServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java index 791d84e..90a923d 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java @@ -656,7 +656,7 @@ //鏁村悎鍔犲伐鍜屽緟鏈烘椂闂村皬浜巒绉掔殑鏁版嵁 erts = mergeLessMinTimeRecords(erts, null); List<MdcEquipmentRunningSection> running = mergeRunningTrace(erts); - if (running != null || !running.isEmpty()) { + if (running != null && !running.isEmpty()) { this.ergodicTrim(running); } return running; -- Gitblit v1.9.3