From 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:45:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
index 654eb1d..291d2e5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
@@ -13,6 +13,7 @@
<result column="sort" property="sort"/>
<result column="remark" property="remark"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="ad_code" property="adCode"/>
</resultMap>
<resultMap id="deptVOResultMap" type="cn.gistack.system.vo.DeptVO">
@@ -26,6 +27,7 @@
<result column="remark" property="remark"/>
<result column="is_deleted" property="isDeleted"/>
<result column="has_children" property="hasChildren"/>
+ <result column="ad_code" property="adCode"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -74,6 +76,18 @@
ORDER BY sort
</select>
+ <select id="treeByParentId" resultMap="treeNodeResultMap">
+ select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
+ <if test="_parameter!=null and _parameter!=''">
+ and (
+ id = #{_parameter} or parent_id = #{_parameter} or parent_id in (
+ select b.id from blade_dept b where b.is_deleted = 0 and b.PARENT_ID = #{_parameter}
+ )
+ )
+ </if>
+ ORDER BY sort
+ </select>
+
<select id="lazyTree" resultMap="treeNodeResultMap" >
SELECT
dept.id,
@@ -112,4 +126,81 @@
and is_deleted = 0
</select>
+ <!--查询组织机构树数据（下级包含人员信息）-->
+ <select id="getDeptAndUserTree" resultType="cn.gistack.common.node.DeptUserTreeNode">
+ (
+ SELECT
+ dept.id,
+ dept.parent_id parentId,
+ dept.dept_name AS name,
+ 0 AS phone,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS hasChildren
+ FROM
+ blade_dept dept WHERE dept.is_deleted = 0
+ <if test="treeNode.id!=null and treeNode.id!=''">
+ and dept.id = #{treeNode.id}
+ </if>
+ )
+ union
+ (
+ select
+ bu.id,
+ bu.dept_id parentId,
+ bu.account AS name,
+ bu.phone,
+ 0 as hasChildren
+ from blade_user bu left join blade_dept bd on bd.id = bu.dept_id
+ where 1=1 and bu.is_deleted = 0 and bu.status = 1
+ <if test="treeNode.id!=null and treeNode.id!=''">
+ and bu.dept_id like concat(concat('%',#{treeNode.id}),'%')
+ </if>
+ )
+ </select>
+
+ <!--查询组织机构树-->
+ <select id="getDeptMap" resultType="cn.gistack.common.node.DeptUserTreeNode">
+ SELECT
+ dept.id,
+ dept.parent_id parentId,
+ dept.dept_name AS name,
+ 1 as isMan,
+ 0 AS phone,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS hasChildren
+ FROM
+ blade_dept dept WHERE dept.is_deleted = 0
+ <if test="treeNode.id!=null and treeNode.id!=''">
+ and dept.id = #{treeNode.id}
+ </if>
+ </select>
+
+ <!--查询组织机构树数据（下级包含人员信息）（排除组织机构对应不上的人员）-->
+ <select id="getUserMap" resultType="cn.gistack.common.node.DeptUserTreeNode">
+ select
+ bu.id,
+ bu.dept_id parentId,
+ bu.real_name AS name,
+ bu.phone,
+ 2 as isMan,
+ 0 as hasChildren
+ from blade_user bu join blade_dept bd on find_in_set(bu.dept_id,bd.id)
+ where 1=1 and bu.is_deleted = 0 and bu.status = 1
+ <if test="treeNode.id!=null and treeNode.id!=''">
+ and bu.dept_id like concat(concat('%',#{treeNode.id}),'%')
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.3