From 4a967f3fc61b791eeb9e248595a1dd83bc3c1ca3 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 18 May 2020 14:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85=E3=80=81?= =?UTF-8?q?=E6=8A=95=E7=A5=A8=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/group/dto/topic/TopicInfoDTO.java | 8 ++++---- .../topic/service/impl/ResiTopicServiceImpl.java | 5 ++++- .../main/resources/mapper/group/ResiGroupDao.xml | 16 ++++++++++++---- .../epmet/dto/result/IssueDetailResultDTO.java | 2 +- .../com/epmet/service/impl/IssueServiceImpl.java | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java index e643a1bd75..f65dc96c40 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java +++ b/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; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index d971d03543..1e56b56073 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/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 attachments = resiTopicAttachmentDao.selectList(wrapper); + if (attachments.size()==NumConstant.ZERO){ + return new TopicInfoDTO(); + } List attachmentUrls = new ArrayList<>(); for(ResiTopicAttachmentEntity attachment : attachments){ attachmentUrls.add(attachment.getAttachmentUrl()); @@ -935,7 +938,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl issueInitiatorResult = epmetUserFeignClient.selectIssueInitiator(issueInitiator); topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator()); return topicInfo; diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 50e26b0f32..8c4fd73028 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/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 - del_flag = 0 - AND resi_group_id = ALL ( SELECT id FROM resi_group WHERE del_flag = 0 AND grid_id = #{gridId} ) - AND customer_user_id = #{userId} + rgm.del_flag = 0 + AND rgm.resi_group_id = ALL ( + SELECT + rg.id + FROM + resi_group rg + WHERE + rg.del_flag = 0 + AND rg.grid_id = #{gridId} + AND rgm.resi_group_id = rg.id ) + AND rgm.customer_user_id = #{userId} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index aa5fa7c6f9..0d95ff6c84 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/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 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index df554f8843..b503ef9fcc 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/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; }