From 0a0aca0ce4696a228b55d4957f9cb634279970e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 17 一月 2026 14:56:01 +0800
Subject: [PATCH] 工序新增bug+工序bom工艺路线删除的时候校验

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