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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 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("该话题已存在");
            }
        }