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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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