From 1add665a46ebae1d4ab4c10008519fb10c882079 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 May 2022 09:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E5=8F=96--=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/entity/ProjectLawsInventoryEO.java   | 5 +++++
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java  | 9 +++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index 6a8237c5c..b074b424c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -381,4 +381,9 @@ public class ProjectLawsInventoryEO implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "虚拟清单iD")
     private String dummyInventoryBaseId;
+
+    //flag为空时第一次调取,flag不为空时,为二次确认
+    @TableField(exist = false)
+    @ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认")
+    private String flag;
 }
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 7f364b1e2..19901580b 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
@@ -224,12 +224,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						projectTaskInventoryEOList.add(projectTaskInventoryEO);
 					});
 				}
-			}else{
-				if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
-					throw new JeroBootException("该虚拟清单的维护清单中没有数据,是否需要添加");
-				}else{
-					throw new JeroBootException("该虚拟清单的维护清单中没有数据,是否需要添加");
-				}
+			}else if(dummyInventoryInfoEOList.size() == 0 && StringUtils.isBlank(projectLawsInventoryEO.getFlag())){
+				//flag为二次确认标识,flag为空时进行验证
+				throw new JeroBootException("该虚拟清单的维护清单中没有数据,是否需要添加");
 			}
 		}