From a4bae07deac36b540631487482f13e694cc13adf Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 17 Apr 2025 18:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=AF=BC=E8=88=AA=E6=A0=91?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/canteen/core/menu/domain/MenuMaterial.java   | 7 +++++++
 .../src/main/resources/mapper/menu/MenuMaterialMapper.xml  | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuMaterial.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuMaterial.java
index 53cfa9f..09514db 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuMaterial.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuMaterial.java
@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.ToString;
 import com.bonus.common.core.web.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 商家食材原料信息对象 menu_material
  *
@@ -75,6 +77,11 @@ public class MenuMaterial extends BaseEntity {
     @ApiModelProperty(value = "类别id")
     private Long categoryId;
 
+    /** 类别ids */
+    @Excel(name = "类别ids")
+    @ApiModelProperty(value = "类别ids")
+    private List categoryIdList;
+
     @Excel(name = "类别名称")
     @ApiModelProperty(value = "类别名称")
     private String categoryName;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
index 3cf85f4..ca03306 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
@@ -90,6 +90,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null  and materialName != ''"> and mm.material_name like concat('%', #{materialName}, '%')</if>
             <if test="materialCode != null  and materialCode != ''"> and mm.material_code like concat('%', #{materialCode}, '%')</if>
             <if test="barCode != null"> and mm.bar_code like concat('%', #{barCode}, '%')</if>
+            <if test="categoryIdList != null and categoryIdList.size() > 0">
+                and mm.category_id in
+                <foreach item="item" collection="categoryIdList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>