From 3548817eb48b952d2a0b897deaf7c82d714db84c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 30 Nov 2020 15:51:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=90=8E=E8=A2=AB?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E3=80=81=E5=85=B3=E9=97=AD=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8D=E8=83=BD=E5=86=8D=E8=BD=AC=E4=B8=BA=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/exception/EpmetErrorCode.java    | 5 ++++-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java | 9 +++++++--
 .../java/com/epmet/modules/utils/ModuleConstant.java     | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 4422f6c1ed..6b83914554 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -136,7 +136,10 @@ public enum EpmetErrorCode {
 	GROUP_NOT_EXISTS(9001,"该组不存在"),
 	GROUP_IN_AUDITING(9002,"该组已提交编辑，处于待审核状态，完成审核前不可再次提交"),
 	GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"),
-	TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核");
+	TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核"),
+    TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"),
+    TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
+    TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题");
 
 
 	private int code;
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 99ad8940fa..14c173cbfa 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
@@ -1255,8 +1255,11 @@ 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())){
-            logger.error(ModuleConstant.CURRENT_TOPIC_COULD_NOT_TURN_TO_ISSUE);
-            throw new RenException(ModuleConstant.CURRENT_TOPIC_COULD_NOT_TURN_TO_ISSUE);
+            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());
+        }else if(StringUtils.equals(ModuleConstant.TOPIC_STATUS_CLOSED,topic.getStatus())){
+            throw new RenException(EpmetErrorCode.TOPIC_IS_CLOSED.getCode());
         }
         //2.通过话题找组信息，得到该组组长信息与当前用户进行对比
         ResiGroupMemberInfoRedisDTO member =
@@ -1433,6 +1436,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      */
     @Override
     public FirstTopicShiftedToIssueApplicationResultDTO shiftIssueV2(ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO) {
+
+
         //话题转议题审核：标题、建议
         String issueTitle = topicTurnIssueFromDTO.getIssueTitle();
         String suggestion = topicTurnIssueFromDTO.getSuggestion();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 3c7ed1387a..d9ad6e9b8e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -262,6 +262,11 @@ public interface ModuleConstant extends Constant {
 	 * */
 	String TOPIC_STATUS_DISCUSSING = "discussing";
 
+    /**
+     * 话题状态： 已屏蔽
+     * */
+	String TOPIC_STATUS_HIDDEN = "hidden";
+
 	/**
 	 * 话题转议题正在审核中
 	 */

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 2/2] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=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());