From 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb Mon Sep 17 00:00:00 2001 From: zenglf <18502938215@163.com> Date: 星期二, 24 十月 2023 10:52:30 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml index a733f7c..003fed6 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml @@ -86,6 +86,7 @@ </if> AND (start_time <= #{ vo.endDate } AND end_time >= #{ vo.startDate }) AND status = '22' + AND alarm != '' </where> ORDER BY start_time -- Gitblit v1.9.3