From 405163ae6c9917d9111d41765725d2b8044901f6 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 May 2021 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=BD=AC=E8=AE=AE=E9=A2=98=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8D=E5=85=81=E8=AE=B8=E5=86=8D=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=88=96=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/exception/EpmetErrorCode.java      |  1 +
 .../topic/service/impl/ResiTopicServiceImpl.java     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

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 b7b70c5159..c2400f5788 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
@@ -150,6 +150,7 @@ public enum EpmetErrorCode {
     TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"),
     TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
     TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"),
+    TOPIC_SHIFT_ISSUE(9009,"该话题已转议题，不允许屏蔽活关闭"),
 
     CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"),
     CATEGORY_NAME(9102,"分类名称已存在，不允许重复"),
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 e6ce2039c7..4d482b9869 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
@@ -629,6 +629,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             throw new RenException(EpmetErrorCode.TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING.getCode());
         }
 
+        //1.4已转议题话题不允许在屏蔽  2021.5.18  sun  start
+        if (topic.getShiftIssue()) {
+            throw new RenException(EpmetErrorCode.TOPIC_SHIFT_ISSUE.getCode());
+        }
+        // 2021.5.18  sun  end
+
         //2.屏蔽话题
         ResiTopicEntity topicForUpdate = new ResiTopicEntity();
         topicForUpdate.setId(hiddenFormDTO.getTopicId());
@@ -766,6 +772,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             throw new RenException(EpmetErrorCode.TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING.getCode());
         }
 
+        //1.4已转议题的话题不允许关闭  2021.5.18   sun   start
+        if (topic.getShiftIssue()) {
+            throw new RenException(EpmetErrorCode.TOPIC_SHIFT_ISSUE.getCode());
+        }
+        //2021.5.18  sun  end
+
         //2.关闭操作
         topic.setClosedStatus(closeFormDTO.getClosedStatus());
         baseDao.updateById(topic);