From f4a54212576db305f578c221d2b640ec6700f7f0 Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Sun, 24 Dec 2023 00:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaMachineMapper.xml        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 7cf90029..b29c512e 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -68,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND mps.prop_id = #{propId}
             </if>
             <if test="keyWord != null and keyWord != ''">
-                AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%'))
+                AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%')
+                or mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord})
+                or mt2.type_name like concat('%',#{keyWord}))
             </if>
             <if test="beginTime != null and endTime != null and beginTime != '' and endTime != null">
                 AND m.create_time between #{beginTime} and #{endTime}