From 148b90030faf1d01a6204f7dab99abcee7a0ffc0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 1 Jul 2022 18:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelServiceImpl.java   | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index b9108ffba..455dd593e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -845,23 +845,38 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 
-						//除了责任领域全有值->可以
-						if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
-							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
-							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
-							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						}else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
-							//除了责任领域,其他的可以全为空->可以
+						if(StringUtils.isBlank(lawEngineerName)){
 							projectRelatedPersonnel.setLawEngineerName("");
-							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
-							projectRelatedPersonnel.setCertificationEngineerName("");
-						}else {//除了责任领域,备注,有一个为空都报错
-							if(CutEnum.CN.getValue().equals(cut)){
-								throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
-							}else{
-								throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check  line" + (i+1));
-							}
+						}else{
+							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
 						}
+						if(StringUtils.isBlank(engineeringInterfacePersonName)){
+							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
+						}else{
+							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
+						}
+						if(StringUtils.isBlank(certificationEngineerName)){
+							projectRelatedPersonnel.setCertificationEngineerName("");
+						}else{
+							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
+						}
+//						//除了责任领域全有值->可以
+//						if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
+//							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
+//							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
+//							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
+//						}else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
+//							//除了责任领域,其他的可以全为空->可以
+//							projectRelatedPersonnel.setLawEngineerName("");
+//							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
+//							projectRelatedPersonnel.setCertificationEngineerName("");
+//						}else {//除了责任领域,备注,有一个为空都报错
+//							if(CutEnum.CN.getValue().equals(cut)){
+//								throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
+//							}else{
+//								throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check  line" + (i+1));
+//							}
+//						}
 
 						//导入的备注为数字,被识别成小数点后一位
 						Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);