From a8aefc69dcd8c5174574dcee9d60413980028684 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 17:56:27 +0800
Subject: [PATCH] 工作汇报接收人接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 14ca0fd..863691e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -60,6 +60,10 @@
on
bu.dept_id = bd.id
left join
+ sys_information si
+ on
+ si.departmentid = bd.id
+ left join
sys_live_location sll
on
sll.worker_id = bu.id
@@ -88,7 +92,7 @@
and bu.status = #{user.status}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
- and bu.jurisdiction = #{user.jurisdiction}
+ and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
@@ -308,7 +312,7 @@
<select id="selectInr" resultType="java.util.HashMap">
SELECT real_name as realName,id FROM blade_user
- WHERE role_id='1412226235153731586'
+ WHERE role_id='1412226235153731586' and status=1
<if test="deptid!=null and deptid!='' and dept!='1123598813738675201'">
and dept_id=#{deptid}
</if>
@@ -341,4 +345,10 @@
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age from blade_user where id = #{userId}
</select>
+
+
+ <select id="selectUser" resultType="java.util.HashMap">
+ select CAST(id AS CHAR) as groupmember,real_name as rname from blade_user
+ </select>
+
</mapper>
--
Gitblit v1.9.3