待审核，已驳回议题详情修改

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/TopicInfoResultDTO.java

@@ -47,6 +47,8 @@ public class TopicInfoResultDTO implements Serializable {
      */
     private String topicPublishMobile;
 
+    private String groupId;
+
     @JsonIgnore
     private String topicUserId;
 

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

@@ -5,14 +5,12 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
 import com.epmet.dto.form.IssueApplicationIdFormDTO;
-import com.epmet.dto.result.AllGridsByUserIdResultDTO;
-import com.epmet.dto.result.ApplicationHistoryResDTO;
-import com.epmet.dto.result.IssueApplicationResDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
+import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.service.GroupIssueService;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
@@ -20,6 +18,10 @@ import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
 import com.epmet.resi.group.dto.group.result.*;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
+import com.epmet.resi.group.dto.group.result.TopicInfoResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -74,7 +76,26 @@ public class GroupIssueServiceImpl implements GroupIssueService {
         userIds.add(data.getUserId());
         TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId());
         userIds.add(topicInfoResultDTO.getTopicUserId());
-        Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        // 查询小组类别
+        ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(topicInfoResultDTO.getGroupId());
+        if (null == resiGroupEntity){
+            throw new RenException("此小组信息不存在");
+        }
+        List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroupEntity.getGroupType(), userIds);
+        if(CollectionUtils.isEmpty(userInfos)){
+            throw new RenException("未查询到用户信息");
+        }
+        userInfos.forEach(u -> {
+            if (u.getUserId().equals(data.getUserId())){
+                data.setIssuePublisher(u.getReleaseUserName());
+                data.setIssuePublisherMobile(u.getMobile());
+            }
+            if (u.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
+                topicInfoResultDTO.setPublishedUser(u.getReleaseUserName());
+                topicInfoResultDTO.setTopicPublishMobile(u.getMobile());
+            }
+        });
+        /*Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
         if (!listResult.success()){
             throw new RenException("查询话题创建者，议题创建者失败......");
         }
@@ -87,7 +108,7 @@ public class GroupIssueServiceImpl implements GroupIssueService {
                 topicInfoResultDTO.setPublishedUser(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
                 topicInfoResultDTO.setTopicPublishMobile(user.getMobile());
             }
-        });
+        });*/
         List<String> gridIds = new ArrayList<>();
         gridIds.add(data.getGridId());
         Result<List<AllGridsByUserIdResultDTO>> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds);

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

@@ -2426,6 +2426,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             UserInfoResultDTO ui = new UserInfoResultDTO();
             ui.setUserId(u.getUserId());
             ui.setReleaseUserHeadPhoto(u.getHeadImgUrl());
+            ui.setMobile(u.getMobile());
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
                 ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -455,6 +455,7 @@
         <result property="topicContent" column="topicContent"/>
         <result property="topicId" column="topicId"/>
         <result property="topicUserId" column="topicUserId"/>
+        <result property="groupId" column="groupId"/>
         <collection property="topicImgs" ofType="java.lang.String">
             <result column="imgUrl"/>
             <result column="id"/>
@@ -466,7 +467,8 @@
             rt.CREATED_BY AS topicUserId,
             UNIX_TIMESTAMP(rt.CREATED_TIME) AS publishedTime,
             rt.TOPIC_CONTENT as topicContent,
-            ta.ATTACHMENT_URL AS imgUrl
+            ta.ATTACHMENT_URL AS imgUrl,
+            rt.GROUP_ID
         FROM resi_topic rt
         LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = rt.ID
         WHERE rt.DEL_FLAG = '0'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoResultDTO.java

@@ -25,4 +25,9 @@ public class UserInfoResultDTO implements Serializable {
      * 话题发布者的头像Url
      */
     private String releaseUserHeadPhoto;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
 }