工位搜索

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}, '%')
+                AND (au.employeeName like concat('%', #{userKey}, '%')
-                or bcp.code 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>