From 9019ad564c2f99559362ddbcbbfa85b428bb8909 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Thu, 22 Sep 2022 13:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BF=90=E7=BB=B4=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/XhpcWorkDeptMapper.xml           | 3 ++-
 .../src/main/resources/mapper/XhpcWorkUserMapper.xml           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
index 36974233..27eabad4 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
@@ -54,7 +54,8 @@
   <select id="selectMapListByParams" resultType="map">
     select
      concat('d_',work_dept_id) as 'id',
-    dept_name as 'name'
+    dept_name as 'name',
+    type
     from xhpc_work_dept
     where del_flag = 0 and status = 1
     <if test="params.tenantId !=null and params.tenantId!=''">
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
index 98a91cba..0b56c79c 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
@@ -144,7 +144,7 @@
 
   <select id="selectMapList" resultType="java.util.Map">
     select
-    u.work_user_id as 'id', u.user_name as 'name'
+    u.work_user_id as 'id', u.user_name as 'name',u.type
     from xhpc_work_user u
     where u.del_flag=0 and u.status=1
     <if test="params.deptId!=null">