huanghongfa
2021-05-21 5e757885a0155141dbac7aa8266c37baf3583aa7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -179,6 +179,7 @@
        Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
        int index = 2;
        for (ComCvtServeExcelVO comCvtServeExcelVO:list) {
            /**
             * 便民服务分类存在 并且 便民服务商家 匹配上
             */
@@ -217,7 +218,7 @@
        boolean saveBatched = this.saveBatch(comCvtServeDOS);
        if(saveBatched) {
            if (comCvtServeDOS.size()>0 && populationImportErrorVOList.size() > 0) {
                return R.fail(populationImportErrorVOList.toString());
                return R.fail(JSON.toJSONString(populationImportErrorVOList));
            }
            if(comCvtServeDOS.size()==0 && populationImportErrorVOList.size() > 0){
                return R.fail(JSON.toJSONString(populationImportErrorVOList));