diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index ebd49f4771..92bd44b4cc 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -200,19 +200,21 @@ public class FlowableRest implements FlowableFeign { flowableQuery.setTaskDefKey(appFlowableRecordVo.getTaskDefKey()); flowableQuery.setMap(map); ResultBean>> resultBean = flowTaskFeign.yuyanTest(flowableQuery); - if(!resultBean.getData().isEmpty()){ - List> mapList = resultBean.getData(); - mapList.forEach(f->{ - PCHistTaskListAndCommentList a = new PCHistTaskListAndCommentList(); - Map stringObjectMap = BeanUtil.beanToMap(f); - stringObjectMap.put("taskName",f.get("nodeName").toString()); - stringObjectMap.put("finishTime",null); - stringObjectMap.put("createTime",""); - stringObjectMap.put("taskUserInfos",new ArrayList<>()); - a.setFlowableRecordVo(stringObjectMap); - a.setState(3 + ""); - flowList.add(a); - }); + if(resultBean.getData() != null){ + if(!resultBean.getData().isEmpty()){ + List> mapList = resultBean.getData(); + mapList.forEach(f->{ + PCHistTaskListAndCommentList a = new PCHistTaskListAndCommentList(); + Map stringObjectMap = BeanUtil.beanToMap(f); + stringObjectMap.put("taskName",f.get("nodeName").toString()); + stringObjectMap.put("finishTime",null); + stringObjectMap.put("createTime",""); + stringObjectMap.put("taskUserInfos",new ArrayList<>()); + a.setFlowableRecordVo(stringObjectMap); + a.setState(3 + ""); + flowList.add(a); + }); + } } } }