Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

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

@@ -18,7 +18,6 @@
 package com.epmet.modules.topic.service.impl;
 
 
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -76,9 +75,9 @@ import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
-import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.dto.topic.result.CheckTopicPublisherResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
@@ -1318,8 +1317,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId()));
             //4.调用gov-issue新增议题
             Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
+            if (issueResult == null || !issueResult.success() || StringUtils.isBlank(issueResult.getData())) {
+                throw new RenException(ModuleConstant.CREATE_ISSUE_ERROR);
+            }
             //5.修改话题shiftIssue字段
-            if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
+
             ResiTopicEntity topic2Upd = new ResiTopicEntity();
             topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
             topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
@@ -1349,8 +1351,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 resiGroupRedis.set(groupCache);
             }
             logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
-
-            }
         }
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -347,4 +347,6 @@ public interface ModuleConstant extends Constant {
 	 * 群邀请二维码跳转页面
 	 */
 	String CODE_INVITE_PAGE = "pages/group/group/invitation/invitation";
+
+	String CREATE_ISSUE_ERROR = "创建议题失败";
 }