From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
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