From 847e0eaac8023aef18e15be3891e8056f22db6fa Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Wed, 30 Jul 2025 15:42:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/codeCollection/WsMaInfoMapper.xml       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
index 0e176313..59663eed 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
@@ -89,10 +89,8 @@
         ws_ma_info
         <where>
             <if test="maCode != null and maCode != ''">
-                and ma_code like concat('%', #{maCode}, '%')
-            </if>
-            <if test="qrCode != null and qrCode != ''">
-                and qr_code = #{qrCode}
+                and (ma_code like concat('%', #{maCode}, '%')
+                or qr_code = #{maCode})
             </if>
         </where>
         LIMIT 10
@@ -115,10 +113,8 @@
         LEFT JOIN ma_type mt1 ON mt1.type_id = mt.parent_id
         <where>
             <if test="maCode != null and maCode != ''">
-                and mm.ma_code like concat('%', #{maCode}, '%')
-            </if>
-            <if test="qrCode != null and qrCode != ''">
-                and qr_code = #{qrCode}
+                and (mm.ma_code like concat('%', #{maCode}, '%')
+                or mm.qr_code = #{maCode})
             </if>
         </where>
         LIMIT 10