|
@@ -992,12 +992,14 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
|
ApproveUserResult submitUser = new ApproveUserResult(t.getOrgName(), t.getOrgType(), t.getLoginName(), t.getRealName(), t.getSchoolId(), t.getCode(), t.getMobileNumber(), t.getCreateTime());
|
|
|
FlowTaskSubmitPeopleAllResult flowTaskSubmitPeopleAllResult = new FlowTaskSubmitPeopleAllResult(t.getFlowId(), submitUser);
|
|
|
|
|
|
- List<ApproveUserResult> approveUserList = new LinkedList<>();
|
|
|
- String[] pendApproveIds = t.getPendApproveId().split(",");
|
|
|
- for (int i = 0; i < pendApproveIds.length; i++) {
|
|
|
- approveUserList.addAll(sysUserService.findById(SystemConstant.convertIdToLong(pendApproveIds[i].trim())));
|
|
|
+ if (Objects.nonNull(t.getPendApproveId())) {
|
|
|
+ List<ApproveUserResult> approveUserList = new LinkedList<>();
|
|
|
+ String[] pendApproveIds = t.getPendApproveId().split(",");
|
|
|
+ for (int i = 0; i < pendApproveIds.length; i++) {
|
|
|
+ approveUserList.addAll(sysUserService.findById(SystemConstant.convertIdToLong(pendApproveIds[i].trim())));
|
|
|
+ }
|
|
|
+ flowTaskSubmitPeopleAllResult.setApproveUserList(approveUserList);
|
|
|
}
|
|
|
- flowTaskSubmitPeopleAllResult.setApproveUserList(approveUserList);
|
|
|
flowTaskSubmitPeopleAllResultList.add(flowTaskSubmitPeopleAllResult);
|
|
|
}
|
|
|
}
|