From 697b4a43e15b8b5e2e2ee82479cd10e2dc0594be Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 26 Apr 2023 10:45:56 +0800
Subject: [PATCH] 动态短信发送记录保存，组织机构数据查询修改，排除部门绑定不上人员数据
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 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 4cc6105..24ae04f 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">
@@ -173,16 +175,16 @@
</if>
</select>
- <!--查询组织机构树数据（下级包含人员信息）-->
+ <!--查询组织机构树数据（下级包含人员信息）（排除组织机构对应不上的人员）-->
<select id="getUserMap" resultType="cn.gistack.common.node.DeptUserTreeNode">
select
bu.id,
bu.dept_id parentId,
- bu.account AS name,
+ bu.real_name AS name,
bu.phone,
2 as isMan,
0 as hasChildren
- from blade_user bu left join blade_dept bd on bd.id = bu.dept_id
+ 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}),'%')
--
Gitblit v1.9.3