From a9f394b28bb124732b7465d8e0880dfd3078b1ef Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 15 Jul 2021 10:51:51 +0800
Subject: [PATCH] 1.保安员证编码
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 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 89d9b79..dcfe229 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -37,27 +37,51 @@
<result column="registered" property="registered"/>
<result column="rtime" property="rtime"/>
<result column="hold" property="hold"/>
+ <result column="jurisdiction" property="jurisdiction"/>
+ <result column="securitynumber" property="securitynumber"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ select bu.* from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where
+ bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
+ and bu.tenant_id = #{tenantId}
</if>
<if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
+ and bu.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and bu.account = #{user.account}
+ </if>
+ <if test="user.hold!=null and user.hold != ''">
+ and bu.hold = #{user.hold}
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and (bd.parent_id = #{user.deptId} or bd.id = #{user.deptId})
+ </if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and bu.role_id = #{user.roleId}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and bu.status = #{user.status}
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and bu.real_name like concat('%', #{user.realName},'%')
</if>
<if test="user.userType!=null and user.userType != ''">
- and user_type = #{user.userType}
+ and bu.user_type = #{user.userType}
+ </if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and bu.securitynumber = #{user.securitynumber}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
- and id in (
+ and bu.id in (
SELECT
user_id
FROM
@@ -69,7 +93,7 @@
</foreach>
)
</if>
- ORDER BY id
+ ORDER BY bu.id
</select>
<select id="getUser" resultMap="userResultMap">
--
Gitblit v1.9.3