Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 a8ba074e4b0807cee707614a55e31e34ea0fbbde

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

@@ -1,4 +1,5 @@
package com.panzhihua.service_community.service.impl;
import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -119,13 +120,17 @@
                BeanUtils.copyProperties(l, comMngRealCompanyDO);
                comMngRealCompanyDO.setCommunityId(communityId);
                comMngRealCompanyDOS.add(comMngRealCompanyDO);
            }else{
                BeanUtils.copyProperties(l, realCompany);
                realCompany.setCommunityId(communityId);
                comMngRealCompanyDOS.add(realCompany);
            }
        });
        boolean batch = this.saveBatch(comMngRealCompanyDOS);
        boolean batch = this.saveOrUpdateBatch(comMngRealCompanyDOS);
        if (batch) {
            return R.ok();
        }
        return R.fail("请检查数据是否重复，格合是否正确");
        return R.fail("请检查格式是否正确");
    }

    @Override