From 5923a521cfe1ae0a1be278263838b5f2fde834b0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 17 八月 2021 09:22:53 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
index 5e051a7..95ed682 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
+++ b/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("该话题已存在");
             }
         }

--
Gitblit v1.7.1