1112修改提交

101captain

2021-11-12 e959172a457f60c2e16b69f60e3404df5fdffcfe

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

@@ -130,7 +130,12 @@
        Long communityId = convenientMerchantDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            convenientMerchantDO.setCommunityName(comActDO.getName());
            if(comActDO!=null){
                convenientMerchantDO.setCommunityName(comActDO.getName());
            }
            else {
                convenientMerchantDO.setCommunityName("西区社区");
            }
        }
        String account = convenientMerchantDTO.getAccount();
        if (isNotBlank(account)) {