Merge remote-tracking branch 'origin/dev'

This commit is contained in:
韩鹏辉 2024-07-10 18:16:17 +08:00
commit 6a8ea3416f
1 changed files with 2 additions and 1 deletions

View File

@ -23,7 +23,8 @@ public interface ShopUserMapper extends BaseMapper<TbShopUser> {
"AND su.shop_id = #{param.shopId} " +
"</if>" +
"<if test='param.name != null and param.name != &quot;&quot;'>" +
"AND (u.nick_name like concat('%', #{param.name}, '%') or u.telephone like concat('%', #{param.name}, '%'))" +
"AND (u.nick_name like concat('%', #{param.name}, '%') or su.name LIKE concat( '%', #{param.name}, '%' ) " +
" or u.telephone like concat('%', #{param.name}, '%') or su.telephone like concat('%', #{param.name}, '%'))" +
"</if>" +
"<if test='isVip != null'>" +
"AND su.is_vip=#{isVip}" +