Merge branch 'txb'

tangxiaobao

2021-08-18 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c

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

@@ -79,7 +79,7 @@
                    .lambda().eq(ComActNeighborCircleTopicDO::getName,addCircleTopicAdminDTO.getName())
                    .eq(ComActNeighborCircleTopicDO::getCommunityId,addCircleTopicAdminDTO.getCommunityId())
                    .ne(ComActNeighborCircleTopicDO::getId,circleTopicDO.getId()));
            if(oldCircleTopicDO != null){
            if(oldCircleTopicDO != null && !oldCircleTopicDO.getId().equals(addCircleTopicAdminDTO.getId())){
                return R.fail("该话题已存在");
            }
        }