Merge branch 'test' into 'master'

罗元桥

2021-08-01 76c1231746d8e13dfeb7caf0bad9727c2a50ea1d

Merge branch 'test' into 'master'

加入try catch模块

See merge request root/zhihuishequ!123

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -365,6 +365,7 @@
    public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception {
        log.info("开始处理导入数据");
        List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>();
        try {
//        List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
        //查询社区信息
        ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
@@ -474,6 +475,10 @@
                }
            }
        }
        }catch (Exception e){
            log.info("出现错误，错误原因：" + e.getMessage());
        }

        //如果有错误，返回错误
        //暂时注释，等客户完成任务需要恢复
        /*if(!populationImportErrorVOList.isEmpty()){