Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-10 688ef1c29f768a336ec73d7234d25da1ca7aef9c

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

@@ -67,7 +67,7 @@
        BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(","))));
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            }
@@ -91,7 +91,7 @@
        }
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(","))));
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            }