From 176209f9cdb9daa629eafd159bb8f8d531e86556 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 29 Sep 2020 14:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 5a419324..0a1a8652 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -264,13 +264,16 @@ public class ResultRecordController extends AbstractController { } String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId()); int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId()); - + //表示是自己查看详情 if(resultRecord.getStaffId().equals(getUserId())){ - List flowRecords = flowRecordService.selectFlowRecordByResultRecordIdTypeStatus(req.getRecordResultId(),resultRecord.getType(),0); - if(flowRecords!=null && flowRecords.size() == 2) { // 表示可以撤回 + List flowRecords = flowRecordService.selectFlowRecordByResultRecordIdTypeStatus(req.getRecordResultId(), resultRecord.getType(), 0); + if (flowRecords != null && flowRecords.size() == 2) { // 表示可以撤回 auth.setCancel(1); } - if(flowRecords!=null && flowRecords.size() >= 2){ + // 审批人是自己，不提供催办按钮,流程结束不显示 + if (flowRecords != null && flowRecords.size() >= 2 && + !getUserId().equals(resultRecord.getCurrentApprovalStaffId()) && + resultRecord.getCurrentApprovalStaffId() != null) { auth.setSubmited(1); } }