From 9ced17f3611f5cff22c335321f75c360cc37f8a3 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Fri, 31 Mar 2023 09:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 7f9817de..2400a534 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2341,17 +2341,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                  }
 
                                                  String issueTimeStr =rowList.get("发布日期");
-                                                 if (issueTimeStr.contains("-")) {
-                                                     sarBussStandAttrInfo.setIssueTime(issueTimeStr);
-                                                 }else {
-                                                     return Result.error("发布日期格式必须为年-月-日");
+                                                 if (StringUtils.isNotBlank(issueTimeStr)){
+                                                     if (issueTimeStr.contains("-")) {
+                                                         sarBussStandAttrInfo.setIssueTime(issueTimeStr);
+                                                     }else {
+                                                         return Result.error("发布日期格式必须为年-月-日");
+                                                     }
                                                  }
 
+
                                                  String putTimeStr = rowList.get("企标实施日期");
-                                                 if (putTimeStr.contains("-")) {
-                                                     sarBussStandAttrInfo.setPutTime(putTimeStr);
-                                                 }else {
-                                                     return Result.error("企标实施日期格式必须为年-月-日");
+                                                 if (StringUtils.isNotBlank(putTimeStr)){
+                                                     if (putTimeStr.contains("-")) {
+                                                         sarBussStandAttrInfo.setPutTime(putTimeStr);
+                                                     }else {
+                                                         return Result.error("企标实施日期格式必须为年-月-日");
+                                                     }
                                                  }
 
 
@@ -2459,12 +2464,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
 ////                                        //采用标准  13
                                                  String cybz = rowList.get("采用标准");
-                                                 if (cybz.equals("IDT等同采用") || cybz.equals("NEQ非等效采用") || cybz.equals("MOD修改采用")){
-                                                     sarBussStandAttrInfo.setCybz(cybz);
-                                                 }else {
-                                                     return Result.error("请提供正确的采用标准");
+                                                 if (StringUtils.isNotBlank(cybz)){
+                                                     if (cybz.equals("IDT等同采用") || cybz.equals("NEQ非等效采用") || cybz.equals("MOD修改采用")){
+                                                         sarBussStandAttrInfo.setCybz(cybz);
+                                                     }else {
+                                                         return Result.error("请提供正确的采用标准");
+                                                     }
                                                  }
 
+
                                                  //文件上传人员
                                                  String userName = tsUserService.userIdByName(userId);
                                                  sarBussStandAttrInfo.setWjscrybuss(userName);