/resi/group/topic/fetchtopicinfowhenauditissue、/gov/issue/issueaudit/audit话题已转议题，请勿重复操作不发送钉钉了

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
  */

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

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