From ea6e07cc264839f0f92a1df245e5f4f08d4f9d91 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 17 Jul 2025 16:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=9F=E6=96=99=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/ims/domain/SupplierBindMaterial.java      | 2 ++
 .../resources/mapper/ims/SupplierBindMaterialMapper.xml    | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java
index 0c73fc3..1872bf6 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java
@@ -92,4 +92,6 @@ public class SupplierBindMaterial extends BaseEntity {
     @ApiModelProperty(value = "供应商名称")
     private String supplierName;
 
+    private List<Long> materialTypeIds;
+
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml
index 4bca402..191a996 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml
@@ -44,10 +44,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="canteenId != null "> and isbm.canteen_id = #{canteenId}</if>
             <if test="supplierId != null "> and isbm.supplier_id = #{supplierId}</if>
+            <if test="supplierName != null  and supplierName != ''"> and isu.supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="materialId != null "> and isbm.material_id = #{materialId}</if>
             <if test="categoryId != null "> and isbm.category_id = #{categoryId}</if>
             <if test="alternativeSupplier != null  and alternativeSupplier != ''"> and isbm.alternative_supplier = #{alternativeSupplier}</if>
             <if test="ifSupply != null "> and isbm.if_supply = #{ifSupply}</if>
+            <if test="materialTypeIds != null and materialTypeIds.size() > 0">
+                and cm.material_type_id in
+                <foreach collection="materialTypeIds" item="materialTypeId" separator="," open="(" close=")">
+                    #{materialTypeId}
+                </foreach>
+            </if>
         </where>
     </select>