From c815dc496c10a11e61b6a56989ad82c215b87de2 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 20 Nov 2024 17:04:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=8C=85=E6=9C=89=E9=87=8F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/controller/StorageStatusController.java      | 2 +-
 .../com/bonus/sgzb/material/mapper/StorageStatusMapper.java    | 2 +-
 .../src/main/resources/mapper/material/StorageStatusMapper.xml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
index 1c5ca563..6252b499 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
@@ -106,7 +106,7 @@ public class StorageStatusController extends BaseController {
         maIds.addAll(xshdrkids);
         Set<Integer> ids = new HashSet<>(maIds);
         startPage();
-        List<MaType> list = storageStatusMapper.getAllRecords(ids);
+        List<MaType> list = storageStatusMapper.getAllRecords(ids,bean);
         return AjaxResult.success(getDataTable(list));
     }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java
index 3eab5c3f..653f116d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/StorageStatusMapper.java
@@ -36,5 +36,5 @@ public interface StorageStatusMapper {
 
     List<Integer> getxshdrk(StorageStatus bean);
 
-    List<MaType> getAllRecords(@Param("ids") Set<Integer> ids);
+    List<MaType> getAllRecords(@Param("ids") Set<Integer> ids,@Param("bean") StorageStatus bean);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
index 0464c252..e7982487 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
@@ -293,6 +293,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="ids" item="maId" open="(" separator="," close=")">
             #{maId}
         </foreach>
+        <if test="bean.maCode != null and bean.maCode != ''">
+            and mm.ma_code like concat('%',#{bean.maCode},'%')
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file