From ddc00ef68497937331c454b043e4ad3baaf7eb6a Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 16 Jun 2022 09:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelServiceImpl.java   | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 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 fa32b479c..0a1fe46f2 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
@@ -746,7 +746,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		List<ProjectRelatedPersonnel> list = new ArrayList<>();
 		if (workbook != null) {
 			Sheet sheet = workbook.getSheetAt(0);
-			deleteBlankRow(sheet);
+			//deleteBlankRow(sheet);
 			if (sheet != null) {
 				if(sheet.getPhysicalNumberOfRows()==0){
 					if (CutEnum.CN.getValue().equals(cut)) {
@@ -791,27 +791,27 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							}
 						}
 					}
-					if (i == 1) {//校验填写说明
-						row = sheet.getRow(i);
-						int columNos = row.getLastCellNum();
-						if (StringUtils.isNotBlank(row.getCell(0).getStringCellValue())){
-							for (int k = 1; k < columNos; k++){
-								if(StringUtils.isNotBlank(row.getCell(k).getStringCellValue())){
-									if (CutEnum.CN.getValue().equals(cut)) {
-										throw new JeroBootException("第二行填写说明列数不对,请按照模板格式填写内容");
-									} else {
-										throw new JeroBootException("The number of explanatory columns in the second line is incorrect. Please fill in the contents according to the template format.");
-									}
-								}
-							}
-						}else {
-							if (CutEnum.CN.getValue().equals(cut)) {
-								throw new JeroBootException("填写说明不能为空,请按照模板格式填写内容");
-							} else {
-								throw new JeroBootException("The description cannot be blank. Please fill in the content according to the template format.");
-							}
-						}
-					}
+//					if (i == 1) {//校验填写说明
+//						row = sheet.getRow(i);
+//						int columNos = row.getLastCellNum();
+//						if (StringUtils.isNotBlank(row.getCell(0).getStringCellValue())){
+//							for (int k = 1; k < columNos; k++){
+//								if(StringUtils.isNotBlank(row.getCell(k).getStringCellValue())){
+//									if (CutEnum.CN.getValue().equals(cut)) {
+//										throw new JeroBootException("第二行填写说明列数不对,请按照模板格式填写内容");
+//									} else {
+//										throw new JeroBootException("The number of explanatory columns in the second line is incorrect. Please fill in the contents according to the template format.");
+//									}
+//								}
+//							}
+//						}else {
+//							if (CutEnum.CN.getValue().equals(cut)) {
+//								throw new JeroBootException("填写说明不能为空,请按照模板格式填写内容");
+//							} else {
+//								throw new JeroBootException("The description cannot be blank. Please fill in the content according to the template format.");
+//							}
+//						}
+//					}
 					if (i > 1) {//读取数据
 						//获取每一行数据
 						row = sheet.getRow(i);