fix: 修复审批状态判断

shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java

@@ -68,12 +68,11 @@ public class ApprovalService {
     public <T> void rejected(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto<T> 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 <T> void passed(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto<T> 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()));