From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
index 1018813..aed220c 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
+++ b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
@@ -6,12 +6,18 @@
<select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
select * from electricity_consumption_area
<where>
+ <if test="electricityConsumptionArea.id != null">
+ id = #{electricityConsumptionArea.id}
+ </if>
<if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
- area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
+ and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
</if>
<if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
</if>
+ <if test="electricityConsumptionArea.sort != null">
+ and sort = #{electricityConsumptionArea.sort}
+ </if>
<if test="electricityConsumptionArea.fuId != null">
and fu_id = #{electricityConsumptionArea.fuId}
</if>
--
Gitblit v1.9.3