From 8a5bef7c5f228d6ed5e71e56844558c3020fdf10 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 08 八月 2023 14:17:47 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml
index 39b812f..2528e52 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml
@@ -52,16 +52,15 @@
t3.sleep_start_date,
t3.sleep_end_date,
t3.is_day_span,
- t4.equipment_name,
- t4.equipment_id
+ t4.equipment_name
FROM
mdc_device_calendar t1
LEFT JOIN mdc_shift t2 ON t1.shift_id = t2.id
LEFT JOIN mdc_shift_sub t3 ON t1.shift_sub_id = t3.id
LEFT JOIN mdc_equipment t4 ON t1.equipment_id = t4.equipment_id
<where>
- <if test="equipmentid != null and equipmentid != ''">
- AND t4.equipment_id = #{ equipmentid }
+ <if test="equipmentId != null and equipmentId != ''">
+ AND t4.equipment_id = #{ equipmentId }
</if>
<if test="stringDate != null and stringDate != ''">
AND t1.effective_date = #{ stringDate }
--
Gitblit v1.9.3