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