From 31848c63cdfcae5cfcf6773636a6e5ba61ea23ff Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 22 Jul 2026 09:56:28 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-22=20RoHS=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/rohs/service/impl/RohsServiceImpl.java       | 1 +
 src/main/resources/mapper/rohs/RohsMapper.xml            | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java
index e35a7f79..7c14fbc7 100644
--- a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java
+++ b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java
@@ -86,6 +86,7 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
         params.put("currentApprover", trimToNull((String) params.get("currentApprover")));
         params.put("ifsPartNo", trimToNull((String) params.get("ifsPartNo")));
         params.put("materialDesc", trimToNull((String) params.get("materialDesc")));
+        params.put("isExpiring", trimToNull((String) params.get("isExpiring")));
 
         long currPage = parseLong(params.get(Constant.PAGE), 1L);
         long pageSize = parseLong(params.get(Constant.LIMIT), 10L);
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index e97eec1f..d2a25021 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -157,6 +157,9 @@
         <if test="params.rohsStatus != null and params.rohsStatus != ''">
             and a.rohs_status = #{params.rohsStatus}
         </if>
+        <if test="params.isExpiring != null and params.isExpiring != ''">
+            and isnull(a.is_expiring, 'N') = #{params.isExpiring}
+        </if>
         <if test="params.nodeId != null and params.nodeId != ''">
             and d.node_id = #{params.nodeId}
         </if>
@@ -213,6 +216,9 @@
         <if test="params.rohsStatus != null and params.rohsStatus != ''">
             and a.rohs_status = #{params.rohsStatus}
         </if>
+        <if test="params.isExpiring != null and params.isExpiring != ''">
+            and isnull(a.is_expiring, 'N') = #{params.isExpiring}
+        </if>
         <if test="params.nodeId != null and params.nodeId != ''">
             and d.node_id = #{params.nodeId}
         </if>
@@ -285,6 +291,9 @@
         <if test="params.rohsStatus != null and params.rohsStatus != ''">
             and a.rohs_status = #{params.rohsStatus}
         </if>
+        <if test="params.isExpiring != null and params.isExpiring != ''">
+            and isnull(a.is_expiring, 'N') = #{params.isExpiring}
+        </if>
         <if test="params.nodeId != null and params.nodeId != ''">
             and d.node_id = #{params.nodeId}
         </if>