From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录，单位数据内网推送
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 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 e71440d..6fc2a3c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,8 @@
<result column="is_apply" property="isApply"/>
<result column="is_train" property="isTrain"/>
<result column="birthtime" property="birthtime"/>
+ <result column="healstats" property="healstats"/>
+ <result column="soil" property="soil"/>
</resultMap>
<!--带坐标-->
@@ -60,6 +62,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
@@ -69,12 +75,6 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- <if test="tenantId!=null and tenantId != ''">
- and bu.tenant_id = #{tenantId}
- </if>
- <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>
@@ -82,7 +82,7 @@
and bu.hold = #{user.hold}
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and (bd.parent_id = #{user.deptId} or bd.id = #{user.deptId})
+ and bu.dept_id = #{user.deptId}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -94,7 +94,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},'%')
@@ -107,19 +107,6 @@
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
and bu.examination_type = #{user.examinationType}
- </if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and bu.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>
@@ -327,7 +314,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>
@@ -360,4 +347,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