From 8b520d872c26e64940dba484211a95d979232e78 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 2 Jun 2022 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?bug53474=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=A1=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, 10 insertions(+), 8 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 2039f36fc..2b04e1369 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
@@ -713,7 +713,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					Row headerRow = sheet.getRow(i);
 					boolean isBlank = dummyInventoryInfoEOService.isRowEmpty(row);
 
-//					if (row != null && !isBlank) {
+					if (row != null && !isBlank) {
 					int columHeadNos = headerRow.getLastCellNum();// 表头总共的列数
 					if (columHeadNos == 5) {//列数对
 						for (int j = 0; j < columHeadNos; j++) {
@@ -735,13 +735,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 								throw new JeroBootException("The number of imported columns is wrong. Please check!");
 							}
 						}*/
-//					}else{
-//						if (CutEnum.CN.getValue().equals(cut)) {
-//							throw new JeroBootException("导入的数据不能为空,请检查");
-//						} else {
-//							throw new JeroBootException("The imported data of cannot be empty. Please check!");
-//						}
-//					}
+					}else{
+						if (CutEnum.CN.getValue().equals(cut)) {
+							throw new JeroBootException("导入的数据不能为空,请检查");
+						} else {
+							throw new JeroBootException("The imported data of cannot be empty. Please check!");
+						}
+					}
 					if (i == 1) {//校验填写说明
 						row = sheet.getRow(i);
 						int columNos = row.getLastCellNum();
@@ -827,8 +827,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			//按照责任领域名,查value
 			if (CutEnum.CN.getValue().equals(cut)) {
 				dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getItemText().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList());
+				System.out.println(dutyTerritoryValueList);
 			} else {
 				dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getEnName().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList());
+				System.out.println(dutyTerritoryValueList);
 			}
 
 			//责任领域