From 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 19 Jul 2021 11:55:53 +0800
Subject: [PATCH] 1.新增保安员列表接口 2.行政区tree 接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 insertions(+), 3 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 1380e8e..1bdcbf1 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -26,22 +26,51 @@
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="cardid" property="cardid"/>
+ <result column="nativeplace" property="nativeplace"/>
+ <result column="nation" property="nation"/>
+ <result column="education" property="education"/>
+ <result column="politicaloutlook" property="politicaloutlook"/>
+ <result column="height" property="height"/>
+ <result column="cell" property="cell"/>
+ <result column="emails" property="emails"/>
+ <result column="address" property="address"/>
+ <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
- and tenant_id!=000000
<if test="user.tenantId!=null and user.tenantId != ''">
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and account != #{user.account}
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and real_name like concat(concat('%', #{user.realName}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
+ </if>
+ <if test="user.nativeplace!=null and user.nativeplace != ''">
+ and nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.sex!=null and user.sex != ''">
+ and sex = #{user.sex}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and status = #{user.status}
+ </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 (
@@ -59,6 +88,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
*
@@ -72,4 +163,8 @@
SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
</select>
+ <update id="updateUser">
+ update blade_user set hold=#{hold} where cardid=#{cardid}
+ </update>
+
</mapper>
--
Gitblit v1.9.3