From b2983b6c7717db3a6eedb88aa2107af63a1a1857 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 15 Aug 2024 11:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/basic/BasicCollectUserMapper.xml      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml
index dfbceb531..c44530e10 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml
@@ -15,8 +15,13 @@
                 AND bcu.workplaceCode = #{workplaceId}
             </if>
             <if test="userKey != null and userKey != ''">
-                AND (bcp.name like concat('%', #{userKey}, '%')
-                or bcp.code like concat('%', #{userKey}, '%')
+                AND (au.employeeName like concat('%', #{userKey}, '%')
+                or au.userName like concat('%', #{userKey}, '%')
+                )
+            </if>
+            <if test="workKey != null and workKey != ''">
+                AND (sw.workplaceName like concat('%', #{workKey}, '%')
+                or sw.workplaceId like concat('%', #{workKey}, '%')
                 )
             </if>
         </where>