diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 910a4b25..56386009 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -884,13 +884,18 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2); + Long commentId = 0l; if (CollectionUtils.isNotEmpty(flowRecords)) { FlowRecord preFlowRecord = flowRecords.get(0); // 评论内容 FlowChart flowChart = flowService.selectFlowChartByChartId(preFlowRecord.getFlowId()); - comment(approvalDto, flowChart); + commentId = comment(approvalDto, flowChart); } + R r = apply(approvalDto); + return r.put("commentId",commentId); + } + public R apply( ApprovalDto approvalDto){ switch (approvalDto.getStatus()) { case 1: //1 提交审批,审批通过 return newSubmit(approvalDto, null); @@ -920,7 +925,7 @@ public class ResultRecordServiceImpl extends ServiceImpl