From e2ce07dbd7b04383dbdd67305c9521a3b5abed81 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Thu, 21 Mar 2024 11:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/base/MaLabelBindMapper.xml   | 10 ++++++----
 .../main/resources/mapper/system/SysNoticeMapper.xml   |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 6176acfc..e521c2b1 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -84,16 +84,18 @@
         LEFT JOIN ma_machine  ma ON ma.ma_id = a.ma_id
         LEFT JOIN sys_user user on user.user_id =a.binder
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
-        <where>
+            <if test="keyWord != null  and keyWord != ''">
+                and (b.label_code like concat('%', #{keyWord}, '%') or
+                ma.ma_code like concat('%', #{keyWord}, '%'))
+            </if>
             <if test="labelCode != null  and labelCode != ''"> and a.label_code = #{labelCode}</if>
-            <if test="typeId != null "> and a.type_id = #{typeId}</if>
+            <if test="typeId != null "> and mt2.type_id = #{typeId}</if>
             <if test="bindTime != null  and bindTime != ''"> and a.bind_time = #{bindTime}</if>
             <if test="binder != null  and binder != ''"> and a.binder = #{binder}</if>
             <if test="labelType != null "> and a.label_type = #{labelType}</if>
             <if test="companyId != null  and companyId != ''"> and a.company_id = #{companyId}</if>
-            <if test="modelId != null  and modelId != ''"> and mt2.type_id= #{modelId}</if>
+            <if test="modelId != null  and modelId != ''"> and mt.type_id= #{modelId}</if>
             <if test="wpName != null  and wpName != ''"> and mt3.type_name = #{wpName}</if>
-        </where>
     </select>
 
     <select id="selectMaLabelBindByMaId" parameterType="Long" resultMap="MaLabelBindVOResult">
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 2dddbae1..ac882139 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sn.remark
         from sys_notice sn left join sys_user su on sn.create_by = su.user_name
         where 1=1
-        <where>
 			<if test="noticeTitle != null and noticeTitle != ''">
 				AND sn.notice_title like concat('%', #{noticeTitle}, '%')
 			</if>
@@ -52,7 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">
 				AND sn.create_by like concat('%', #{createBy}, '%')
 			</if>
-		</where>
     </select>
     
     <insert id="insertNotice" parameterType="com.bonus.sgzb.system.domain.SysNotice">