|
|
@@ -1656,16 +1656,16 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
List<WorkflowRecord> recordList = mapRecords.get(task.getProcessInstanceId());
|
|
|
if (recordList != null && recordList.size() > 1) {
|
|
|
String comment = recordList.get(recordList.size() - 1).getMessage();
|
|
|
- if (comment.contains("【驳回】")) {
|
|
|
+ if (StrUtil.isNotEmpty(comment) && comment.contains("【驳回】")) {
|
|
|
User rejectUser = userService.getById(recordList.get(recordList.size() - 1).getCreateUserId());
|
|
|
vo.setRejectState(rejectUser.getName() + "驳回");
|
|
|
- } else if (comment.contains("自动驳回")) {
|
|
|
+ } else if (StrUtil.isNotEmpty(comment) && comment.contains("自动驳回")) {
|
|
|
vo.setRejectState("系统自动驳回");
|
|
|
}
|
|
|
}
|
|
|
if (recordList != null && recordList.size() > 2) {
|
|
|
String comment2 = recordList.get(recordList.size() - 2).getMessage();
|
|
|
- if (comment2.contains("自动驳回")) {
|
|
|
+ if (StrUtil.isNotEmpty(comment2) && comment2.contains("自动驳回")) {
|
|
|
vo.setRejectState("系统自动驳回");
|
|
|
}
|
|
|
}
|