From 9bbb34239f62fd6e40d7b507672fd68b5289c1ba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 00:55:46 +0800
Subject: [PATCH] 设备列表接口修改，新增部门信息接口
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 36c8f8a..7c7f9ae 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
@@ -100,6 +100,9 @@
<if test="user.account!=null and user.account != ''">
and s.account = #{user.account}
</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}
</if>
@@ -137,13 +140,24 @@
<!--查询处警人员列表-->
<select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
- SELECT bu.*,p.jd,p.wd FROM blade_user bu
- LEFT JOIN
+ SELECT bu.id,bu.name,bu.code,bu.real_name realName,bu.account,
+ bu.email,bu.phone,bu.birthday,bu.create_time createTime,
+ bu.sex,ifnull(bu.online_status,0) online_status,
+ bd.dept_name deptName,p.jd,p.wd FROM blade_user bu
+ LEFT JOIN
jfpt.sys_position p
- on
+ on
p.snumber=bu.code
- where
- role_id = #{user.roleId}
+ left join
+ blade_dept bd
+ on
+ bd.id=bu.dept_id
+ left join
+ blade_role br
+ on
+ bu.role_id=br.id
+ where
+ br.role_alias ='处警员'
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
and bu.real_name like #{realName}
--
Gitblit v1.9.3