From cf8134d1a85dbeff1d91a44591c3354216033efc Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 16 Aug 2022 14:25:13 +0800
Subject: [PATCH] =?UTF-8?q?57325=20=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E8=AF=84=E4=BC=B0-?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9D=A1=E6=AC=BE=E5=A4=84=E7=90=86=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E5=AD=97=E5=B8=A6=E5=B0=8F=E6=95=B0=E7=82=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...LawsTechnologyEvaluationEOServiceImpl.java | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 98d18c7dc..044b7ccfd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -410,9 +410,31 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				for (int i = 0; i < rowNos ; i++) {
 					Row row = sheet.getRow(i + 1);
 					if(row != null){
-						String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						String itemNum = "";
+						Cell itemNumCell = row.getCell(0);
+						if(itemNumCell != null){
+							itemNumCell.setCellType(CellType.STRING);
+							itemNum = itemNumCell.toString();
+						}
+
+						String itemName = "";
+						Cell itemNameCell = row.getCell(1);
+						if(itemNameCell != null){
+							itemNameCell.setCellType(CellType.STRING);
+							itemName = itemNameCell.toString();
+						}
+
+						String itemContents = "";
+						Cell itemContentsCell = row.getCell(2);
+						if(itemContentsCell != null){
+							itemContentsCell.setCellType(CellType.STRING);
+							itemContents = itemContentsCell.toString();
+						}
+
+						/*String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
-						String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();*/
+
 						Map<String,Object> itemInfoMap = new HashMap<>();
 						String itemId = UUID.randomUUID().toString().replace("-", "");
 						itemInfoMap.put("itemId",itemId);