From fe0d8127adaa0b2bc15610a46f4f59c36e7d3f54 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Fri, 19 Mar 2021 16:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=8F=A3=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basepopulationinfo/BasePopulationInfoController.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java b/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java
index 28e4f6d..3c95eb7 100644
--- a/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java
+++ b/src/main/java/com/cm/population/controller/apis/basepopulationinfo/BasePopulationInfoController.java
@@ -154,7 +154,14 @@ public class BasePopulationInfoController extends AbstractController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @PostMapping("uploadtemplate")
     public SuccessResultData uploadTemplate(@RequestParam(value = "file") MultipartFile file) throws SearchException, IOException {
-        EasyExcel.read(file.getInputStream(),new PopulationBaseInfoUploadListener(basePopulationInfoService)).sheet().doRead();
+        try {
+            EasyExcel.read(file.getInputStream(),new PopulationBaseInfoUploadListener(basePopulationInfoService)).sheet().doRead();
+        } catch (Exception e){
+            return new SuccessResultData("第{" + PopulationBaseInfoUploadListener.rowNumber  + "}行数据有误,请检查数据: "
+                    + PopulationBaseInfoUploadListener.errorCardNumber
+                    + "---"
+                    + PopulationBaseInfoUploadListener.errorName);
+        }
         return new SuccessResultData("导入完成");
     }