From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index d1bcfb8..d23c716 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -78,10 +78,10 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and account like concat('%',#{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and real_name like concat('%',#{user.real_name},'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
@@ -113,13 +113,16 @@
s.role_id=br.id
where s.is_deleted = 0
<if test="user.account!=null and user.account != ''">
- and s.account = #{user.account}
+ and s.account like concat('%',#{user.account},'%')
+ </if>
+ <if test="user.cardid!=null and user.cardid != ''">
+ and s.cardid like concat('%',#{user.cardid},'%')
</if>
<if test="user.id!=null and user.id != ''">
and s.id = #{user.id}
</if>
<if test="user.realName!=null and user.realName != ''">
- and s.real_name = #{user.realName}
+ and s.real_name like concat('%',#{user.real_name},'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and s.user_type = #{user.userType}
@@ -140,7 +143,7 @@
</foreach>
)
</if>
- ORDER BY id
+ ORDER BY id desc
</select>
<select id="selectUserPagetxl" resultMap="userResultMaps">
--
Gitblit v1.9.3