From 3a419e3b9dbcbac8f9887c427d9c63b52c5f10df Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 30 Nov 2020 16:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 14c173cbfa..eeb9111641 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1254,7 +1254,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             //没有相应的话题
             logger.error(ModuleConstant.NO_SUCH_TOPIC);
             throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
-        }else if(topic.getShiftIssue() || StringUtils.isNotBlank(topic.getIssueId()) || !StringUtils.equals(ModuleConstant.TOPIC_STATUS_DISCUSSING,topic.getStatus())){
+        }else if(topic.getShiftIssue() || StringUtils.isNotBlank(topic.getIssueId())){
             throw new RenException(EpmetErrorCode.TOPIC_ALREADY_SHIFTED_TO_ISSUE.getCode());
         }else if(StringUtils.equals(ModuleConstant.TOPIC_STATUS_HIDDEN,topic.getStatus())){
             throw new RenException(EpmetErrorCode.TOPIC_IS_HIDDEN.getCode());