议题详情、投票校验修改

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java

@@ -18,12 +18,12 @@ public class TopicInfoDTO implements Serializable {
     /**
      * 话题id
      */
-    private String topicId;
+    private String topicId = "";
 
     /**
      * 话题内容
      */
-    private String topicContent;
+    private String topicContent = "";
 
     /**
      * 图片列表
@@ -33,11 +33,11 @@ public class TopicInfoDTO implements Serializable {
     /**
      * 话题发表人（山东路168-尹女士）
      */
-    private String publishedUser;
+    private String publishedUser = "";
 
     /**
      * 话题发表时间 (时间戳 毫秒级)
      */
-    private Long publishedTime;
+    private Long publishedTime = 0L;
 
 }

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

@@ -928,6 +928,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId());
         wrapper.orderByAsc(TopicConstant.SORT);
         List<ResiTopicAttachmentEntity> attachments = resiTopicAttachmentDao.selectList(wrapper);
+        if (attachments.size()==NumConstant.ZERO){
+            return new TopicInfoDTO();
+        }
         List<String> attachmentUrls = new ArrayList<>();
         for(ResiTopicAttachmentEntity attachment : attachments){
             attachmentUrls.add(attachment.getAttachmentUrl());
@@ -935,7 +938,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         topicInfo.setTopicImgs(attachmentUrls);
         //话题发起人
         IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO();
-        issueInitiator.setUserId(topicInfo.getTopicId());
+        issueInitiator.setUserId(topicInfo.getPublishedUser());
         Result<IssueInitiatorResultDTO> issueInitiatorResult = epmetUserFeignClient.selectIssueInitiator(issueInitiator);
         topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator());
         return topicInfo;

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

@@ -283,11 +283,19 @@
         SELECT
             COUNT(*) AS joinTeamCounts
         FROM
-            resi_group_member joinTeamCounts
+            resi_group_member rgm
+        WHERE
+            rgm.del_flag = 0
+            AND rgm.resi_group_id = ALL (
+            SELECT
+                rg.id
+            FROM
+                resi_group rg
             WHERE
-            del_flag = 0
+                rg.del_flag = 0
-            AND resi_group_id = ALL ( SELECT id FROM resi_group WHERE del_flag = 0 AND grid_id = #{gridId} )
+                AND rg.grid_id = #{gridId}
-            AND customer_user_id = #{userId}
+                AND rgm.resi_group_id = rg.id )
+            AND rgm.customer_user_id = #{userId}
     </select>
 
     <!-- 查询一个网格下面所有组Id -->

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java

@@ -48,7 +48,7 @@ public class IssueDetailResultDTO implements Serializable {
     /**
      * 项目状态    已结案：true，未结案：false
      */
-    private Boolean projectStatus;
+    private Boolean projectStatus = false;
 
     /**
      * 投票状态    已投票：true，未投票：false

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -171,8 +171,8 @@ public class IssueServiceImpl implements IssueService {
             voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
             voteResultDTOResult.setSupportCount(NumConstant.ZERO);
         }else {
-            voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
             voteResultDTOResult = govIssueFeignClient.voteCount(issueId).getData();
+            voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
         }
         return voteResultDTOResult;
     }