From 9d3f74efd354c27d5f0b94aa6c36895d21b08a34 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 16 Dec 2024 17:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/device/DevInfoMapper.xml     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 0a4bf94..d73f455 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -91,10 +91,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt1 ON mt1.type_id = mt2.parent_id and mt1.del_flag = '0'
         <where>
             <if test="maId != null "> and d.ma_id = #{maId}</if>
-            <if test="code != null  and code != ''"> and d.code = #{code}</if>
             <if test="deviceName != null and deviceName != ''">
                 and d.device_name like concat('%',#{deviceName},'%')
             </if>
+            <if test="deviceName != null and deviceName != ''">
+                and d.code like concat('%',#{code},'%')
+            </if>
+            <if test="deviceName != null and deviceName != ''">
+                and d.identify_code like concat('%',#{identifyCode},'%')
+            </if>
             <if test="typeId != null">
                 <choose>
                     <when test="level != null and level == 4">