Merge branch 'dev_third_data' into dev_temp

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(9008,"该话题已转议题，不允许关闭或屏蔽"),
 
     CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"),
     CATEGORY_NAME(9102,"分类名称已存在，不允许重复"),

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);