From 2d1a927c87a274745144cb75225e549bde8c86ba Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:36:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=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=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...LawsTechnologyEvaluationEOServiceImpl.java | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 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 f621b8719..df16067d3 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
@@ -394,17 +394,18 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数
 				for (int i = 0; i < rowNos ; i++) {
 					Row row = sheet.getRow(i + 1);
-
-					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();
-					Map<String,Object> itemInfoMap = new HashMap<>();
-					String itemId = UUID.randomUUID().toString().replace("-", "");
-					itemInfoMap.put("itemId",itemId);
-					itemInfoMap.put("itemNum",itemNum);
-					itemInfoMap.put("itemName",itemName);
-					itemInfoMap.put("itemContent",itemContents);
-					result.add(itemInfoMap);
+					if(row != null){
+						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();
+						Map<String,Object> itemInfoMap = new HashMap<>();
+						String itemId = UUID.randomUUID().toString().replace("-", "");
+						itemInfoMap.put("itemId",itemId);
+						itemInfoMap.put("itemNum",itemNum);
+						itemInfoMap.put("itemName",itemName);
+						itemInfoMap.put("itemContent",itemContents);
+						result.add(itemInfoMap);
+					}
 				}
 			}
 		}

From 4e6539a9fdd50d4c48c9ad6bf6504c7b1ee57298 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:42:46 +0800
Subject: [PATCH 2/2] update

---
 .../controller/LawsTechnologyEvaluationEOController.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index 2ba73e8c3..fb3f82b0e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -206,8 +206,8 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 	 @AutoLog(value = "条款导入")
 	 @ApiOperation(value = "条款导入")
 	 @PostMapping(value = "/importItemExcel")
-	 public List<Map<String,Object>> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception {
+	 public Result<?> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception {
 		 List<Map<String,Object>> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request);
-		 return result;
+		 return Result.OK(result);
 	 }
 }