From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
index 0ec8435..3fe6a5a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
@@ -42,6 +42,48 @@
and bu.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
+ and bu.account like concat('%',#{user.account},'%')
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and bu.real_name like concat(concat('%',#{user.realName}),'%')
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and bu.user_type = #{user.userType}
+ </if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and bu.role_id like concat('%',#{user.roleId},'%')
+ </if>
+ <if test="deptIdList!=null and deptIdList.size()>0">
+ and 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>
+
+ <select id="getAllUser" resultType="cn.gistack.system.user.vo.UserVO">
+ select bu.*,armp.jobName from blade_user bu
+ left join (
+ select "user_phone" as userPhone,CONCAT_WS('-',"user_unit","position") jobName from SJZT_MD."att_res_manage_person" where "guid" in (
+ select max("guid") as guid from SJZT_MD."att_res_manage_person" group by "user_phone"
+ )
+ ) armp on bu.phone = armp.userPhone
+ 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>
<if test="user.realName!=null and user.realName != ''">
@@ -97,5 +139,30 @@
SELECT * FROM BLADE_USER
WHERE IS_DELETED = 0 AND PHONE LIKE CONCAT('%',#{phoneIds},'%')
</select>
+ <select id="getSysUserNum" resultType="java.lang.Integer">
+ select count(*) from (
+ select bu.id from blade_user bu
+ where bu.is_deleted = 0
+ <if test="deptIdList!=null and deptIdList.size()>0">
+ and 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>
+ )
+
+ </select>
+
+
+
+
+
</mapper>
--
Gitblit v1.9.3