From 49b9f6de191286be6a80cb9373fb45997e21bd71 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 9 Jun 2022 11:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelServiceImpl.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 3a5bef3ce..f88d076b7 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
@@ -545,7 +545,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			}
 
 			Row rowExplain = sheet.createRow(1);
-			short height = (short) (7 * 252);
+			short height = (short) (7 * 200);
 			rowExplain.setHeight((short) height);
 			Cell cell = rowExplain.createCell(0);
 			cell.setCellValue(explain);
@@ -653,7 +653,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			}
 
 			Row rowExplain = sheet.createRow(1);
-			short height = (short) (7 * 252);
+			short height = (short) (7 * 200);
 			rowExplain.setHeight((short) height);
 			Cell cell = rowExplain.createCell(0);
 			cell.setCellValue(explain);
@@ -761,13 +761,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 									}
 								}
 							}
-						}else if(i!=1 && columHeadNos != 5) {
+						}/*else if(i!=1 && columHeadNos != 5) {
 							if (CutEnum.CN.getValue().equals(cut)) {
 								throw new JeroBootException("导入的列数不对,请按照模板格式填写内容");
 							} else {
 								throw new JeroBootException("The number of imported columns is wrong. Please fill in the contents according to the template format.");
 							}
-						}
+						}*/
 					}else{
 						if (CutEnum.CN.getValue().equals(cut)) {
 							throw new JeroBootException("导入的数据不能为空,请检查");
@@ -814,18 +814,18 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
 							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
 							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						}else if(StringUtils.isBlank(lawEngineerName) || StringUtils.isBlank(engineeringInterfacePersonName) || StringUtils.isBlank(certificationEngineerName)) {
+						}else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
 							//除了责任领域,其他的可以全为空->可以
 							projectRelatedPersonnel.setLawEngineerName("");
 							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
 							projectRelatedPersonnel.setCertificationEngineerName("");
-						}/*else {//除了责任领域,备注,有一个为空都报错
+						}else {//除了责任领域,备注,有一个为空都报错
 							if(CutEnum.CN.getValue().equals(cut)){
-								throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行");
+								throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
 							}else{
-								throw new JeroBootException("Please fill in the required fields marked with * .Please check  line" + (i+1));
+								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);