From c0a78b608d90f13fc34018c8d88ddf5c44acdbd7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 10:17:09 +0800
Subject: [PATCH] 1.数据源修改 2.单位添加字段
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 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 176114a..2083156 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -37,11 +37,18 @@
<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"/>
+ <result column="examinationType" property="examinationType"/>
+ <result column="examinationMx" property="examinationMx"/>
+ <result column="fingerprint" property="fingerprint"/>
+ <result column="photo" property="photo"/>
+ <result column="dispatch" property="dispatch"/>
+ <result column="my_picture" property="myPicture"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
select * from blade_user where is_deleted = 0
- and tenant_id!=000000
<if test="user.tenantId!=null and user.tenantId != ''">
and tenant_id = #{user.tenantId}
</if>
@@ -50,6 +57,9 @@
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and dept_id like concat(concat('%', #{user.deptId}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
@@ -65,6 +75,11 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and hold = #{user.hold}
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and jurisdiction = #{user.jurisdiction}
+ </if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and securitynumber = #{user.securitynumber}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
@@ -82,6 +97,68 @@
ORDER BY id
</select>
+
+ <!--保安员列表-->
+ <select id="selectUserPageSecurity" resultMap="userResultMap">
+ select
+ bu.*
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where
+ bu.is_deleted = 0
+ and
+ bd.dept_category = 1
+ <if test="user.tenantId!=null and user.tenantId != ''">
+ and bu.tenant_id = #{user.tenantId}
+ </if>
+ <if test="user.account!=null and user.account != ''">
+ and bu.account != #{user.account}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and bu.real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and bu.user_type = #{user.userType}
+ </if>
+ <if test="user.nativeplace!=null and user.nativeplace != ''">
+ and bu.nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.sex!=null and user.sex != ''">
+ and bu.sex = #{user.sex}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and bu.status = #{user.status}
+ </if>
+ <if test="user.hold!=null and user.hold != ''">
+ and bu.hold = #{user.hold}
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and bu.jurisdiction = #{user.jurisdiction}
+ </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 (
+ SELECT
+ user_id
+ FROM
+ blade_user_dept
+ WHERE
+ dept_id IN
+ <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+ ORDER BY bu.id
+ </select>
+
+
+
<select id="getUser" resultMap="userResultMap">
SELECT
*
--
Gitblit v1.9.3