|
@@ -1,5 +1,6 @@
|
|
|
package com.dragonsoft.dcuc.approve.model.dto;
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
|
|
|
import com.dragonsoft.duceap.duwf.api.model.TaskHistoryDetailVo;
|
|
|
import lombok.Data;
|
|
@@ -53,9 +54,12 @@ public class ProcessInstanceInfoDTO {
|
|
|
String processInstanceId = "";
|
|
|
if (processInstanceVO != null) {
|
|
|
TaskHistoryDetailVo taskHistoryDetailVo = processInstanceVO.getTaskHistoryDetailVo();
|
|
|
- flowNodeCode = taskHistoryDetailVo.getTaskCode();
|
|
|
- flowNodeName = taskHistoryDetailVo.getName();
|
|
|
- taskKey = taskHistoryDetailVo.getTaskDefinitionKey();
|
|
|
+ if (ObjectUtil.isNotNull(taskHistoryDetailVo)) {
|
|
|
+ flowNodeCode = taskHistoryDetailVo.getTaskCode();
|
|
|
+ flowNodeName = taskHistoryDetailVo.getName();
|
|
|
+ taskKey = taskHistoryDetailVo.getTaskDefinitionKey();
|
|
|
+ }
|
|
|
+
|
|
|
flowKey = processInstanceVO.getPocessDefinitionId();
|
|
|
processInstanceId = processInstanceVO.getProcessInstanceId();
|
|
|
}
|