wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2021-01-13 14:10:05 +08:00
parent c4a2a84151
commit 8bbcff5212
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -894,16 +894,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
if (StringUtil.isBlank(approvalDto.getMenuName())) { if (StringUtil.isBlank(approvalDto.getMenuName())) {
throw new RRException("menuName 不能为空"); throw new RRException("menuName 不能为空");
} }
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2); List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2);
Long commentId = 0l; Long commentId = 0l;
if (CollectionUtils.isNotEmpty(flowRecords)) { R r = apply(approvalDto);
if (CollectionUtils.isNotEmpty(flowRecords) && r !=null
&& NumberUtil.objToIntDefault(r.get("code"),200) == 200 ) {
FlowRecord preFlowRecord = flowRecords.get(0); FlowRecord preFlowRecord = flowRecords.get(0);
// 评论内容 // 评论内容
FlowChart flowChart = flowService.selectFlowChartByChartId(preFlowRecord.getFlowId()); FlowChart flowChart = flowService.selectFlowChartByChartId(preFlowRecord.getFlowId());
commentId = comment(approvalDto, flowChart); commentId = comment(approvalDto, flowChart);
} }
R r = apply(approvalDto);
if (approvalDto.getLoginUserId() != null) { if (approvalDto.getLoginUserId() != null) {
List<TaskListDto> taskListDtos = flowRecordMapper.selectTodoTasksByApprovalStaffId(approvalDto.getLoginUserId(), null); List<TaskListDto> taskListDtos = flowRecordMapper.selectTodoTasksByApprovalStaffId(approvalDto.getLoginUserId(), null);
if (taskListDtos != null && taskListDtos.size() > 0) { if (taskListDtos != null && taskListDtos.size() > 0) {