From 4fc35bc07b14aa6fea89b9ba89141eb69e1caa43 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 04 十二月 2025 15:08:41 +0800
Subject: [PATCH] yys1.协同办公:关闭签字功能,除报销管理外,关闭其余附件功能。    2.营销管理:关闭销售台账附件功能。    3.仓储物料:需增加成品入库    4.生产管控:生产派工需要新增派工产线及生产人    5.设备管理:设备台账关闭设备品牌和存放位置

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