From ddc6f04bd1c32cc69e4fc8b41a66cee07ff34ea4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 11 Oct 2024 09:14:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/annualinit/entity/ProcessAnnualInitLink.java   | 6 ------
 .../annualinit/service/ProcessAnnualInitLinkService.java   | 7 ++++---
 .../process/planchange/entity/ProcessPlanChangeLink.java   | 6 ------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java
index 42111baa..f39d0b6c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java
@@ -145,12 +145,6 @@ public class ProcessAnnualInitLink implements Serializable {
      */
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
-    /**
-     * 删除状态(0-正常,1-删除)
-     */
-    @ApiModelProperty(value = "删除状态(0-正常,1-删除)")
-    @TableLogic
-    private Integer delFlag;
 
 
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
index 135e2fb6..a4a575dc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
@@ -192,9 +192,10 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
                 excelVO.setRevisionType(espRevisionTypeMap.get(revisionType));
             }
             String standardNumber = excelVO.getStandardNumber();
-            if (StringUtils.isBlank(standardNumber)){
-                msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
-            }else if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
+            if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
+                if (StringUtils.isBlank(standardNumber)){
+                    msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
+                }
                 LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
                 if (lawsEnterpriseStandard != null){
                     excelVO.setStandardId(lawsEnterpriseStandard.getId());
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java
index 6b964056..cb1e5888 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java
@@ -189,12 +189,6 @@ public class ProcessPlanChangeLink implements Serializable {
      */
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
-    /**
-     * 删除状态(0-正常,1-删除)
-     */
-    @ApiModelProperty(value = "删除状态(0-正常,1-删除)")
-    @TableLogic
-    private Integer delFlag;
 
 
 }