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 10:57:09 +08:00
parent ea96d6f75b
commit 31ea785f0e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -953,7 +953,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private R rejectN(ApprovalDto approvalDto) {
log.info("驳回到前n个节点");
log.info("驳回到前n个节点 ： " + JSON.toJSONString(approvalDto) );
FlowRecord f = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
ResultRecord resultRecord = resultRecordService.selectResultRecordById(f.getRecordId());
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(), f.getFlowIndex());
@ -1132,6 +1133,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private R reSubmit(ApprovalDto approvalDto) {
List<FlowRecord> currflowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2);
if (CollectionUtils.isNotEmpty(currflowRecords)) {
FlowRecord preFlowRecord = currflowRecords.get(0);
if (approvalDto.getLoginUserId() != null && approvalDto.getLoginUserId() > 0) {
if (!preFlowRecord.getApprovalStaffId().equals(approvalDto.getLoginUserId())) {
log.info("审批人不是自己 ，ApprovalStaffId :" + preFlowRecord.getApprovalStaffId() + ",登陆用户 id:" + approvalDto.getLoginUserId());
return R.error("审批人不是自己，不能撤回");
}
}
}
return newReject(approvalDto);
}