Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -24,6 +24,7 @@
import com.vci.ubcs.flow.engine.constant.FlowEngineConstant;
import com.vci.ubcs.flow.engine.entity.FlowProcess;
import com.vci.ubcs.flow.engine.utils.FlowCache;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.user.cache.UserCache;
import com.vci.ubcs.system.user.entity.User;
import lombok.AllArgsConstructor;
@@ -340,10 +341,11 @@
               flow.setHistoryActivityIdea(commentList.get(0).getFullMessage());
            }
         }
         List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(task.getProcessInstanceId()).orderByProcessInstanceStartTime().asc().list();
         flow.setProcessDefinitionStartTime(VciDateUtil.date2Str(processInstanceList.get(0).getStartTime(),VciDateUtil.DateTimeFormat));
         // 获取流程发起人名称
         if (FlowEngineConstant.START_EVENT.equals(historicActivityInstance.getActivityType())) {
            List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery()
               .processInstanceId(task.getProcessInstanceId()).orderByProcessInstanceStartTime().asc().list();
            if (processInstanceList.size() > 0) {
               if (StringUtil.isNotBlank(processInstanceList.get(0).getStartUserId())) {
                  String taskUser = processInstanceList.get(0).getStartUserId();
@@ -357,9 +359,14 @@
         }

         if (Func.isNotEmpty(historicProcessInstance)) {
            String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
            String[] businessKey = new String[2];
            if(historicProcessInstance.getBusinessKey().contains(StringPool.COLON)){
               businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
            }else{
               businessKey[0] = historicProcessInstance.getBusinessKey();
            }
            flow.setBusinessTable(businessKey[0]);
            flow.setBusinessId(businessKey.length>1?businessKey[1]:"1");
            flow.setBusinessId(businessKey.length>1 && StringUtils.isNotEmpty(businessKey[1])?businessKey[1]:"1");
         }

         FlowProcess processDefinition = FlowCache.getProcessDefinition(task.getProcessDefinitionId());