From 7661cf3c3725cd3a9057625ea4a5f1add9001f25 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 八月 2025 09:40:14 +0800
Subject: [PATCH] feat: 仓库货架修改

---
 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