From 845372f87dd1153e5ad17d930f1d71c33c0dab71 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 22:40:32 +0800
Subject: [PATCH] 用户接口修改
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 70b9d65..ad66bd4 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -26,11 +26,77 @@
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="online_status" property="online_status"/>
- <result column="channlId" property="channlId"/>
+ <result column="work_status" property="work_status"/>
+ </resultMap>
+
+ <resultMap id="userResultMaps" type="org.springblade.system.user.vo.UserVO">
+ <result column="id" property="id"/>
+ <result column="tenant_id" property="tenantId"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
+ <result column="code" property="code"/>
+ <result column="user_type" property="userType"/>
+ <result column="account" property="account"/>
+ <result column="password" property="password"/>
+ <result column="name" property="name"/>
+ <result column="real_name" property="realName"/>
+ <result column="email" property="email"/>
+ <result column="phone" property="phone"/>
+ <result column="birthday" property="birthday"/>
+ <result column="sex" property="sex"/>
+ <result column="role_id" property="roleId"/>
+ <result column="dept_id" property="deptId"/>
+ <result column="post_id" property="postId"/>
+ <result column="online_status" property="online_status"/>
+ <result column="work_status" property="work_status"/>
+ <result column="jd" property="jd"/>
+ <result column="wd" property="wd"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ select * from blade_user
+ where is_deleted = 0
+ <if test="tenantId!=null and tenantId != ''">
+ and tenant_id = #{tenantId}
+ </if>
+ <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}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and real_name = #{user.realName}
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and user_type = #{user.userType}
+ </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 id
+ </select>
+
+ <select id="selectUserPages" resultMap="userResultMaps">
+ select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
+ LEFT JOIN jfpt.sys_position p ON p.snumber = s.CODE
+ LEFT JOIN jfpt.sys_enclosure e ON e.anumber = s.CODE
+
+ where is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
and tenant_id = #{tenantId}
</if>
--
Gitblit v1.9.3