From 0b434d28735cefaf7daf36811eac2cee8c03706c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 14 Oct 2022 13:29:32 +0800
Subject: [PATCH] =?UTF-8?q?/resi/group/topic/fetchtopicinfowhenauditissue?=
 =?UTF-8?q?=E3=80=81/gov/issue/issueaudit/audit=E8=AF=9D=E9=A2=98=E5=B7=B2?=
 =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98=EF=BC=8C=E8=AF=B7=E5=8B=BF=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=8F=91=E9=80=81=E9=92=89?=
 =?UTF-8?q?=E9=92=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/dto/result/YtHsjcResDTO.java  | 2 +-
 .../java/com/epmet/service/impl/IssueServiceImpl.java     | 4 +---
 .../modules/topic/service/impl/ResiTopicServiceImpl.java  | 8 +++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHsjcResDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHsjcResDTO.java
index 4dcf8869a1..001c7fe0ae 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHsjcResDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHsjcResDTO.java
@@ -6,7 +6,7 @@ import java.util.List;
 
 
 /**
- * @Description
+ * @Description 核酸结果查询
  * @Author yzm
  * @Date 2022/9/26 17:04
  */
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 63efe318c7..b576a0f1ca 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -577,8 +577,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     app2update.setIssueId(issueResult.getIssueId());
 
                 }
-            }else {
-                throw new RenException(topicInfo.getInternalMsg());
             }
 
 
@@ -610,7 +608,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
                 .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(application.getCustomerId(), application.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
         if (!flag) {
-            logger.error("发送(小组成就)系统消息到message服务失败");
+            logger.warn("发送(小组成就)系统消息到message服务失败");
         }
         return app2update.getIssueId();
     }
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 e3ebc257d2..1592aa0fe7 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
@@ -34,6 +34,7 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
@@ -1716,7 +1717,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
         Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
         if (issueCount != NumConstant.ZERO){
-            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+            // throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+            return;
         }
         CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
         dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId());
@@ -1799,7 +1801,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
         Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
         if (issueCount != NumConstant.ZERO){
-            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), ModuleConstant.ALREADY_SHIFT_ISSUE, ModuleConstant.ALREADY_SHIFT_ISSUE);
         }
 
         //话题转议题审核：标题、建议
@@ -2013,7 +2015,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
 
         if (topic.getShiftIssue()) {
-            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), ModuleConstant.ALREADY_SHIFT_ISSUE, ModuleConstant.ALREADY_SHIFT_ISSUE);
         }
 
         IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(param, IssueShiftedFromTopicFormDTO.class);