From a3b72bdd43a1e61c2c08a65b1625106d2ac9d3bf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 18 三月 2024 16:31:38 +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/MdcEquipmentMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 4e0ace6..9eec769 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -238,6 +238,12 @@
<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
+ <if test="mdcEquipment.deviceLevel != null and mdcEquipment.deviceLevel != '' ">
+ AND t1.device_level = #{mdcEquipment.deviceLevel}
+ </if>
+ <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
+ AND t1.device_category = #{mdcEquipment.deviceCategory}
+ </if>
<if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">
AND t3.id IN
<foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">
--
Gitblit v1.9.3