From e9d6ec161b8a987c6ce3e73ae75fced6086e1788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Wed, 12 Mar 2025 23:04:09 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B0=B4=E9=97=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java  | 2 +-
 .../src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
index de3e4293..3d5bdab9 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
@@ -201,7 +201,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
         List<DfYhV2> list = list(new LambdaQueryWrapper<DfYhV2>().eq(DfYhV2::getRecordId, byId.getRecordId()));
         if (CollectionUtils.isNotEmpty(list) && !list.isEmpty()) {
             long count = list.stream().filter(e -> Objects.equals(DfYhV2StatusEnum.ACCEPTED.getValue(), e.getStatus())).count();
-            if (count+1==list.size()) {
+            if (count+1==list.size() || Objects.equals(1,list.size())) {
                 Wrapper<DfCheckingRecord> wp = Wrappers.<DfCheckingRecord>lambdaUpdate()
                         .eq(DfCheckingRecord::getId, byId.getRecordId())
                         .set(DfCheckingRecord::getStatus, status);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
index 414c26bf..201666e7 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
@@ -34,6 +34,7 @@ import com.shuili.common.utils.BeanUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -206,7 +207,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
         List<SzYhV2> list = list(new LambdaQueryWrapper<SzYhV2>().eq(SzYhV2::getRecordId, byId.getRecordId()));
         if (CollectionUtils.isNotEmpty(list) && !list.isEmpty()) {
             long count = list.stream().filter(e -> Objects.equals(DfYhV2StatusEnum.ACCEPTED.getValue(), e.getStatus())).count();
-            if (count+1==list.size()) {
+            if (count+1==list.size()|| Objects.equals(1,list.size())) {
                 Wrapper<SzCheckingRecord> wp = Wrappers.<SzCheckingRecord>lambdaUpdate()
                         .eq(SzCheckingRecord::getId, byId.getRecordId())
                         .set(SzCheckingRecord::getStatus, status);
@@ -214,6 +215,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
             }
         }
     }
+
     @Override
     public String formStatus(String formId) {
         return ApprovalStatusEnum.SUBMITTING.getValue();