Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/mapper/TBDingApplyMapper.xml

@@ -164,8 +164,8 @@
             tbda.reason,
             (select group_concat(ba.`path` SEPARATOR ';') from basic_attachment ba where find_in_set(ba.id, tbda.attachment_ids)) as attachmentPaths,
             (select CONCAT(tffl.approve_remark, ';' ,tffl.create_time) from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1) as approveInfo,
-            (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
-		where find_in_set(us1.id, (select group_concat(tffl.approve_id) from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id and tffl.approve_setup > 1))) as approveUsersName,
+            IFNULL((select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
+		where find_in_set(us1.id, (select group_concat(tffl.approve_id) from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id and tffl.approve_setup > 1))),'--') as approveUsersName,
             ss.id as supplierId,
             tbd.id as dingId,
             ss.name as supplierName,

sop-business/src/main/resources/mapper/TBProjectExchangeMapper.xml

@@ -33,8 +33,8 @@
             tfcf.flow_deployment_id as flowDeploymentId,
             tfcfe.id as customFlowEntityid,
             tffa.update_time as flowTime,
-            (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
-             where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))) as approveUsersName
+            IFNULL((select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
+             where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))),'--') as approveUsersName
         from t_b_project_exchange tbpe
                  left join t_f_custom_flow_entity tfcfe on tfcfe.code = tbpe.exchange_no
                  left join t_f_flow_approve tffa on tffa.flow_id = tfcfe.flow_id

sop-business/src/main/resources/mapper/TBQualityProblemApplyMapper.xml

@@ -19,8 +19,8 @@
         (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskId,
         (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
         where find_in_set(us1.id, a.user_ids)) user_names,
-        (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
-        where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = fe.flow_id order by tffl.create_time desc limit 1))) pend_approve_users
+        IFNULL((select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
+        where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = fe.flow_id order by tffl.create_time desc limit 1))),'--') pend_approve_users
         FROM
         t_b_quality_problem_apply a
         LEFT JOIN t_b_sop_info si on si.sop_no = a.sop_no

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -76,8 +76,8 @@
                art.NAME_ as taskName,
                art.TASK_DEF_KEY_ as taskDefKey,
                (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId,
-               (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
-                where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))) as pendApproveName
+               IFNULL((select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
+                where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))),'--') as pendApproveName
                 <if test="fieldName != null and fieldName != ''">
                     ,${fieldName}
                 </if>