Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1757,7 +1757,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Override
     @Transactional
     public FirstTopicShiftedToIssueApplicationResultDTO shiftIssueV2(ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO) {
-
+        //首先校验 话题是否存在 是否已被转为议题
+        ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(topicTurnIssueFromDTO.getTopicId());
+        if(null == group) {
+            throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
+        }
+        TopicInfoFormDTO topicId = new TopicInfoFormDTO();
+        topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
+        Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
+        if (issueCount != NumConstant.ZERO){
+            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+        }
 
         //话题转议题审核：标题、建议
         String issueTitle = topicTurnIssueFromDTO.getIssueTitle();
@@ -1789,16 +1799,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //1.统一时间(群组服务 -> 议题服务)
         Date now = new Date();
         //2.调用gov-org获取数据权限
-        ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(topicTurnIssueFromDTO.getTopicId());
-        if(null == group) {
-            throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
-        }
-        TopicInfoFormDTO topicId = new TopicInfoFormDTO();
-        topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
-        Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
-        if (issueCount != NumConstant.ZERO){
-            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
-        }
         CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
         dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId());
         dataFilterParam.setGridId(group.getGridId());