From 4053559c3b36fedbca8405b39d4a45c8c7933ad6 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 21 Nov 2023 10:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/flowtask/FlowTaskService.java         | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 04465457..6cfe3de1 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -742,7 +742,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     userName.append(data.getName()).append(",");
                 }
                 String userName_str="";
-                userName_str=userName.substring(0,userName.length()-1);
+                if(StringUtils.isNotBlank(userName)){
+                    userName_str=userName.substring(0,userName.length()-1);
+                }
+
                 flowTask.setAssigneeName(userName_str);
             }
             flowTask.setPreviousPersonSid(histTask.get("previousPersonSid")==null?"":histTask.get("previousPersonSid").toString());
@@ -750,42 +753,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
             flowTask.setTaskDefKey(histTask.get("taskDefKey") == null ? "" : histTask.get("taskDefKey").toString());
             flowTask.setTaskName(histTask.get("NAME_") == null ? "" : histTask.get("NAME_").toString());
-            // 判断是否办结
-            /*Object end_act_id_ = histTask.get("END_ACT_ID_");
-            if (end_act_id_ != null) {
-                flowTask.setTaskName(ProcessStateEnum.FINISHED.getStateName());
-            }*/
-
-            // 流程定义信息
-//            ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
-//                    .processDefinitionId(histTask.get("PROC_DEF_ID_").toString())
-//                    .singleResult();
             flowTask.setDeployId(histTask.get("DEPLOYMENT_ID_") == null ? "" : histTask.get("DEPLOYMENT_ID_").toString());
             flowTask.setProcDefName(histTask.get("PROC_DEF_NAME_") == null ? "" : histTask.get("PROC_DEF_NAME_").toString());
             flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
             flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
 
-            // 流程发起人信息
-//            HistoricProcessInstance hi = historyService.createHistoricProcessInstanceQuery()
-//                    .processInstanceId(histTask.get("PROC_INST_ID_").toString())
-//                    .singleResult();
             ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
+            if(!sysUserVoResultBean.getSuccess()){
+                continue;
+            }
             flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
             flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
-          //  ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId());
             if(sysUserVoResultBean.getData()!=null){
                 flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
                 flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
-                /*ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid());
-                String ogrName="";
-                if(pathSidByUserSid.getData()!=null){
-                    ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData());
-                    ogrName=sysOrganizationVoResultBean.getData().getName();
-                }
-                flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());*/
             }
-          //  flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
             HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskId(flowTask.getTaskId()).singleResult();
             flowTask.setProcessVariables(historicTaskInstance.getProcessVariables());
             Object end_act_id = histTask.get("end_act_id_");