From 813b80aeea6829d082d6461da33894a99f07edba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:47:49 +0800
Subject: [PATCH] 1.新增根据用户编号查询用户信息接口 2.修复考勤导出信息中考勤类型缺失bug
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 7c7f9ae..45f8c7a 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
@@ -55,6 +55,7 @@
<result column="work_status" property="work_status"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="dept_name" property="deptName"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -139,11 +140,11 @@
</select>
<!--查询处警人员列表-->
- <select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
- SELECT bu.id,bu.name,bu.code,bu.real_name realName,bu.account,
- bu.email,bu.phone,bu.birthday,bu.create_time createTime,
+ <select id="selectSecurityUserPageList" resultMap="userResultMaps">
+ SELECT bu.id,bu.name,bu.code,bu.real_name,bu.account,
+ bu.email,bu.phone,bu.birthday,bu.create_time,
bu.sex,ifnull(bu.online_status,0) online_status,
- bd.dept_name deptName,p.jd,p.wd FROM blade_user bu
+ bd.dept_name,p.jd,p.wd FROM blade_user bu
LEFT JOIN
jfpt.sys_position p
on
@@ -158,6 +159,7 @@
bu.role_id=br.id
where
br.role_alias ='处警员'
+ and bu.is_deleted=0
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
and bu.real_name like #{realName}
@@ -168,4 +170,9 @@
</if>
order by bu.code asc
</select>
+
+ <!--根据用户编号查询用户信息-->
+ <select id="selUserByCode" resultType="org.springblade.system.user.entity.User">
+ select code,dept_id deptId from blade_user where is_deleted = 0 and code=#{code}
+ </select>
</mapper>
--
Gitblit v1.9.3