From 53fd3c067de9d386167aecaf9dcd79fe6abe0c94 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 8 Sep 2025 16:22:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/cook/CookMaterialMapper.xml   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
index 73bb8d9..8b2e53c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
@@ -89,6 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
             <if test="barCode != null  and barCode != ''"> and cm.bar_code = #{barCode}</if>
             <if test="unitId != null "> and cm.unit_id = #{unitId}</if>
+            <if test="unitName != null and unitName != '' and unitName == 'CRKYTJ' ">
+                and (iu.unit_name = '斤' or iu.unit_name = '公斤')
+            </if>
+            <if test="unitName != null and unitName != '' and unitName != 'CRKYTJ' ">
+                and iu.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+            </if>
             <if test="salePrice != null "> and cm.sale_price = #{salePrice}</if>
             <if test="unitPrice != null "> and cm.unit_price = #{unitPrice}</if>
             <if test="salesMode != null "> and cm.sales_mode = #{salesMode}</if>