|
@@ -1,6 +1,8 @@
|
|
|
package com.dragonsoft.dcuc.approve.business.impl;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.EnumUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -223,8 +225,12 @@ public class WorkFlowBusinessImpl implements IWorkFlowBusiness {
|
|
|
List<TaskDefinitionVo> taskDefinitionVoList = new ArrayList<>();
|
|
|
if (outgoingVo != null) {
|
|
|
taskDefinitionVoList = outgoingVo.getTaskDefinitionVoList();
|
|
|
- for (TaskDefinitionVo taskDefinitionVo : outgoingVo.getTaskDefinitionVoList()) {
|
|
|
- taskDefinitionKeyList.add(taskDefinitionVo.getTaskDefinitionKey());
|
|
|
+ if (CollUtil.isNotEmpty(taskDefinitionKeyList)) {
|
|
|
+ for (TaskDefinitionVo taskDefinitionVo : taskDefinitionVoList) {
|
|
|
+ if (ObjectUtil.isNotNull(taskDefinitionVo)) {
|
|
|
+ taskDefinitionKeyList.add(taskDefinitionVo.getTaskDefinitionKey());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|