Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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);
 	 }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -394,7 +394,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数
 				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 itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
@@ -408,6 +408,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 					}
 				}
 			}
+		}
 		return result;
 	}