上提一下

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -940,6 +940,18 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
      */
     @Override
     public void shiftProjectV2(ShiftProjectFormDTO formDTO) {
+        //1:查询议题数据
+        IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
+        if (null == entity) {
+            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+        }
+        if (IssueConstant.ISSUE_SHIFT_PROJECT.equals(entity.getIssueStatus())) {
+            throw new RenException(IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION);
+        }
+        if (!IssueConstant.ISSUE_VOTING.equals(entity.getIssueStatus())) {
+            throw new RenException(IssueConstant.ISSUE_VOTING_EXCEPTION);
+        }
+        formDTO.setIssueDTO(ConvertUtils.sourceToTarget(entity, IssueDTO.class));
 
         //获取议题分类
         List<IssueCategoryDTO> categoryList = issueCategoryService.getCategoryByIssue(formDTO.getIssueId());
@@ -965,18 +977,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
 
         //因需要保证议题表中的转项目时间与创建项目时间一致 因此先新增项目数据再更新议题数据
-        //1:查询议题数据
-        IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
-        if (null == entity) {
-            throw new RenException(IssueConstant.SELECT_EXCEPTION);
-        }
-        if (IssueConstant.ISSUE_SHIFT_PROJECT.equals(entity.getIssueStatus())) {
-            throw new RenException(IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION);
-        }
-        if (!IssueConstant.ISSUE_VOTING.equals(entity.getIssueStatus())) {
-            throw new RenException(IssueConstant.ISSUE_VOTING_EXCEPTION);
-        }
-        formDTO.setIssueDTO(ConvertUtils.sourceToTarget(entity, IssueDTO.class));
 
         //2:调用resi-group查询话题创建人数据(目前议题来源只有来自话题),为了到项目服务初始数据以及发送消息使用
         Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId());