From d1dc45551ac3ddc6861ebbe0ca9041b8c1b11a56 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Mon, 26 Sep 2022 16:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=A0=91=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcWorkTypeDictMapper.xml         | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
index 1675c35f..9ae25037 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
@@ -45,24 +45,30 @@
   </select>
   <select id="selectMapListByParentParams" resultType="map">
     select
-    work_type_id as 'id',
-    name as 'name',
-    sort as 'sort',
-    parent_type_id as 'parentId'
-    from xhpc_work_type_dict
-    where del_flag = 0 and status = 1
+    t.work_type_id as 'id',
+    t.name as 'name',
+    t.sort as 'sort',
+    t.parent_type_id as 'parentId',
+    t.auto_send as 'autoSend',
+    t.auto_run as 'autoRun',
+    t.measure,
+    t.user_id as 'userId',
+    u.user_name as 'userName'
+    from xhpc_work_type_dict t
+    left join xhpc_work_user u on u.work_user_id=t.user_id
+    where t.del_flag = 0 and t.status = 1
     <if test="params.tenantId !=null and params.tenantId!=''">
-      and tenant_id=#{params.tenantId}
+      and t.tenant_id=#{params.tenantId}
     </if>
     <choose>
       <when test="params.parentTypeId!=null and params.parentTypeId!='' ">
-        and parent_type_id=#{params.parentTypeId}
+        and t.parent_type_id=#{params.parentTypeId}
       </when>
         <otherwise>
-          and (parent_type_id is null or parent_type_id='')
+          and (t.parent_type_id is null or t.parent_type_id='')
         </otherwise>
     </choose>
-    order by sort desc, work_type_id asc
+    order by t.sort desc, t.work_type_id asc
   </select>