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 | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 83cf1b4..d23c716 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -29,7 +29,10 @@
<result column="work_status" property="work_status"/>
<result column="examination_type" property="examination_type"/>
<result column="examination_mx" property="examination_mx"/>
+ <result column="audit_time" property="auditTime"/>
+ <result column="cardid" property="cardid"/>
<result column="district" property="district"/>
+ <result column="jurisdiction" property="jurisdiction"/>
</resultMap>
<resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UsersVo">
<result column="id" property="id"/>
@@ -60,6 +63,9 @@
<result column="examination_type" property="examination_type"/>
<result column="examination_mx" property="examination_mx"/>
<result column="dept_name" property="deptName"/>
+ <result column="audit_time" property="auditTime"/>
+ <result column="cardid" property="cardid"/>
+ <result column="jurisdiction" property="jurisdiction"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -72,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}
@@ -105,15 +111,18 @@
blade_role br
on
s.role_id=br.id
- where s.is_deleted = 0 and br.role_alias ='qfqkdw'
+ 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}
@@ -134,7 +143,7 @@
</foreach>
)
</if>
- ORDER BY id
+ ORDER BY id desc
</select>
<select id="selectUserPagetxl" resultMap="userResultMaps">
@@ -213,8 +222,7 @@
on
bu.role_id=br.id
where
- br.role_alias ='qfqkdw'
- and bu.is_deleted=0
+ bu.is_deleted=0
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
and bu.real_name like #{realName}
@@ -325,4 +333,22 @@
GROUP BY
bu.district
</select>
+
+
+ <!--查询用户数据,未审核的-->
+ <select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
+ select id, cardid
+ from blade_user
+ where examination_type is null
+ </select>
+
+ <!--查询账号相同的数量-->
+ <select id="selectCountAccount" resultType="java.lang.Integer">
+ select count(*) from blade_user where 1=1
+ and status = 1
+ and is_deleted = 0
+ and account = #{account}
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3