From 191a365f106b1b9328a6457aa35e027d4af1fe5d Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 10 Jun 2022 14:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8B=BC=E6=8E=A5=E5=8A=9E=E7=90=86=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkOrderServiceImpl.java         |  5 ++++-
 .../main/resources/mapper/XhpcWorkOrderMapper.xml  | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
index 096b8019..b4bf7952 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
@@ -135,7 +135,10 @@ public class WorkOrderServiceImpl implements WorkOrderService {
 
             userIdList.insert(0, userDomain.getWorkUserId() + ",");
         }
-        orderMapper.insertOrderUser(orderUserDomainList);
+
+        if(orderUserDomainList.size() > 0){
+            orderMapper.insertOrderUser(orderUserDomainList);
+        }
 
         if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){
             sendSms(userIdList.toString(), domain.getWorkOrderId().toString());
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
index e8d30240..b4ed3d27 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
@@ -55,10 +55,10 @@
     o.title as 'title',
     o.type as 'typeId',
     td.name as 'typeName',
-    u.dept_id as 'deptId',
-    d.dept_name as 'deptName',
-    u.work_user_id as 'userId',
-    u.user_name as 'userName',
+    GROUP_CONCAT(u.dept_id) as 'deptId',
+    GROUP_CONCAT(d.dept_name) as 'deptName',
+    GROUP_CONCAT(u.work_user_id) as 'userId',
+    GROUP_CONCAT(u.user_name, '(', d.dept_name, ')') as 'userName',
     o.`status` as 'status'
     from xhpc_work_order o
     left join xhpc_work_type_dict td on td.work_type_id=o.type
@@ -81,7 +81,7 @@
 
 
   <select id="selectByPrimaryKey" resultType="com.xhpc.activity.domain.XhpcWorkOrderDomain">
-    select 
+    select
     <include refid="Base_Column_List" />,
     d.device_name, s.name, co.start_time, co.source, td.name as 'type_name'
     from xhpc_work_order o
@@ -98,8 +98,8 @@
   <insert id="insert" keyColumn="work_order_id" keyProperty="workOrderId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderDomain" useGeneratedKeys="true">
     insert into xhpc_work_order (`type`, title, content, fault_time
       device_type, serial_number, reason, disposal_method,
-      `status`, del_flag, tenant_id, 
-      create_time, create_by, update_time, 
+      `status`, del_flag, tenant_id,
+      create_time, create_by, update_time,
       update_by, remark)
     values (#{type,jdbcType=SMALLINT}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{faultTime, jdbcType=TIMESTAMP}
       #{deviceType,jdbcType=VARCHAR}, #{serialNumber,jdbcType=VARCHAR},