From a452e01cf489b546ebe65e08fcb1213b30e60cfa Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 15:25:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj

---
 src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
index 95db3ff..611d51e 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
@@ -6,8 +6,8 @@
         from spare_parts sp
         left join spare_parts sp1 on sp1.id = sp.parent_id
         <where>
-            <if test="spareParts.name != null">
-                and name like concat('%',#{spareParts.name},'%')
+            <if test="spareParts.name != null and spareParts.name != ''">
+                and sp.name like concat('%',#{spareParts.name},'%')
             </if>
         </where>
     </select>

--
Gitblit v1.9.3