From d180f69b4aac9322576398a193f3a64dcec8a32f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:00 +0800
Subject: [PATCH] 好友
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 44 ++++++--------------------------------------
1 files changed, 6 insertions(+), 38 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 c148115..82b34a5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -224,12 +224,6 @@
bu.is_deleted = 0
and
bd.dept_category = 1
- <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>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -257,19 +251,6 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</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>
@@ -289,12 +270,6 @@
bd.dept_category = 1
and
(hold = 2 or hold = 3)
- <if test="tenantId!=null and tenantId != ''">
- and bu.tenant_id = #{tenantId}
- </if>
- <if test="user.account!=null and user.account != ''">
- and bu.account = #{user.account}
- </if>
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
@@ -315,19 +290,6 @@
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
- </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>
@@ -398,4 +360,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