From 209b93a0f335e8adb46f85e860a7882bb6ae3adf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 10 Oct 2024 14:20:08 +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=20=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessAnnualInitLinkService.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

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 a2ce2565..26fbf9be 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
@@ -129,17 +129,12 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
                 if (StringUtils.isNotEmpty(msg.toString())) {
                     throw new JeroBootException(msg.toString());
                 }
-                for (ProcessAnnualInitLinkExcelVO excelDatum : excelList) {
-                    String standardNumber = excelDatum.getStandardNumber();
-                    LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
-                    excelDatum.setStandardId(lawsEnterpriseStandard.getId());
-                }
                 return excelList;
             } catch (Exception e) {
+                log.error("文件导入失败:",e);
                 if(Objects.isNull(e.getMessage())){
                     throw new JeroBootException("文件导入失败:请填写内容标题！");
                 }
-                log.error("文件导入失败:",e);
                 throw new JeroBootException("文件导入失败:" + e.getMessage());
             } finally {
                 try {
@@ -185,12 +180,20 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
                 excelVO.setRevisionType(espRevisionTypeMap.get(revisionType));
             }
             String standardNumber = excelVO.getStandardNumber();
-            LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
-            if (lawsEnterpriseStandard != null){
-                excelVO.setStandardId(lawsEnterpriseStandard.getId());
+            if (StringUtils.isBlank(standardNumber)){
+                msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
+            }else {
+                LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
+                if (lawsEnterpriseStandard != null){
+                    excelVO.setStandardId(lawsEnterpriseStandard.getId());
+                }else {
+                    msgSub.append("第" + (i + 4) + "行" + "企标编号不存在;");
+                }
             }
             String standardName = excelVO.getStandardName();
-
+            if (StringUtils.isBlank(standardName)){
+                msgSub.append("第" + (i + 4) + "行" + "企标名称不能为空;");
+            }
             String mainDraftingUser = excelVO.getMainDraftingUser();
             if (StringUtils.isBlank(mainDraftingUser)){
                 msgSub.append("第" + (i + 4) + "行" + "起草人不能为空;");