From 9c674b77247d3024a18fde62280c6438667e7b61 Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 12 Jul 2024 17:39:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/common/service/ApprovalService.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java index f94c3fc6..690e2004 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java @@ -68,12 +68,11 @@ public class ApprovalService { public void rejected(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto dto) { ApprovalBusinessService service = approvalType.getService(); if (service != null) { - String status = service.formStatus(id); - if (!ApprovalStatusEnum.WAITING.getValue().equals(status)) { - throw new RuntimeException("不能重复审批"); - } ApprovalTask approvalTask = approvalTaskService.getById(id); if (approvalTask != null) { + if (!ApprovalStatusEnum.WAITING.getValue().equals(approvalTask.getStatus())) { + throw new RuntimeException("不能重复审批"); + } approvalTask.setStatus(ApprovalStatusEnum.REJECT.getValue()); approvalTask.setComment(dto.getComment()); approvalTask.setDoc(JSON.toJSONString(dto.getDoc())); @@ -89,12 +88,11 @@ public class ApprovalService { public void passed(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto dto) { ApprovalBusinessService service = approvalType.getService(); if (service != null) { - String status = service.formStatus(id); - if (!ApprovalStatusEnum.WAITING.getValue().equals(status)) { - throw new RuntimeException("不能重复审批"); - } ApprovalTask approvalTask = approvalTaskService.getById(id); if (approvalTask != null) { + if (!ApprovalStatusEnum.WAITING.getValue().equals(approvalTask.getStatus())) { + throw new RuntimeException("不能重复审批"); + } approvalTask.setStatus(ApprovalStatusEnum.PASS.getValue()); approvalTask.setComment(dto.getComment()); approvalTask.setDoc(JSON.toJSONString(dto.getDoc()));