From e325737441e7a632fcc26600606bdb43a78f8f22 Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Sat, 9 Dec 2023 12:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=8D=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=88=E6=B3=95=E8=A7=84/=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E8=8B=A5=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=97=B6=E5=88=99=E7=BC=96=E5=8F=B7=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8D=E5=86=8D=E9=9A=8F=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=89=20=E4=B8=8D=E6=B6=89=E5=8F=8A?=
 =?UTF-8?q?=E4=B9=9F=E9=9C=80=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java      | 3 ++-
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index fa8b3b6ec..5062b405c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1401,7 +1401,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			List<BussDocumentLibraryEO> docList = iBussDocumentLibraryEOService.listByIds(standIdList);
 			for (ProjectCertificationInventoryEO data : datas) {
 				//处理编号，认证清单中若状态为符合时则编号标题不再随文档库变化
-				if (!data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+				if ((!data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
+						|| !data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue()))
 						&& StringUtils.isNotBlank(data.getBussDocumentLibraryId())) {
 					BussDocumentLibraryEO docObj = null;
 					for (BussDocumentLibraryEO obj : docList) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 3430e28c8..2effaaaf2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1561,7 +1561,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
 				//处理编号，法规清单中若状态为符合时则编号标题不再随文档库变化
 				if ((!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())
-						|| !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()))
+						|| !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())
+						|| !projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+						|| !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue()))
 						&& StringUtils.isNotBlank(projectLawsInventoryEO.getStandId())) {
 					BussDocumentLibraryEO docObj = null;
 					for (BussDocumentLibraryEO obj : docList) {