From b759be01560cd63fb0406ba0c8ffd6ce265b1776 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Aug 2021 14:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E8=A2=AB=E6=8F=90=E5=88=B0=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=E5=88=86=E6=88=90=E4=B8=A4=E4=B8=AA=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/EventDetailResultDTO.java | 5 +++++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java index e5997ab62f..18295391c5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -66,6 +66,11 @@ public class EventDetailResultDTO implements Serializable { */ private List eventPerson; + /** + * 被提到的组织 + */ + private List eventOrg; + /** * 报事人名字 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 83d20152fd..b102b84c85 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -201,8 +201,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl data = orgResult.getData(); - data.addAll(dto.getEventPerson()); - dto.setEventPerson(data); + dto.setEventOrg(data); // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){ baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId());