Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -146,10 +146,9 @@ public class HouseController {
         List<Integer> numList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(failList)){
             for ( IcHouseExcel entity : failList) {
-                log.error("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
+                log.warn("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
                 numList.add(entity.getRowNum());
             }
-            //return new Result().error(8001,failList.get(0).getErrorMsg());
         }
         List<IcHouseExcel> result =importResult.getList();
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java

@@ -60,7 +60,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("neighborhood")
 public class NeighborHoodController {
-    
+
     @Autowired
     private IcNeighborHoodService icNeighborHoodService;
     @Autowired
@@ -210,7 +210,7 @@ public class NeighborHoodController {
         List<Integer> numList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(failList)){
             for ( IcNeighborHoodExcel entity : failList) {
-                log.error("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
+                log.warn("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息
                 numList.add(entity.getRowNum());
             }
             //return new Result().error(8001,failList.get(0).getErrorMsg());
@@ -231,4 +231,4 @@ public class NeighborHoodController {
 
 
 
-}
+}