From 7c5a12c19f48e52708b84a7e6544e15da7271227 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 27 Apr 2021 13:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/service/impl/NoticeReadRecordServiceImpl.java | 4 ++--
 .../topic/service/impl/TopicDraftServiceImpl.java        | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
index c8c4cc1b1b..fe871a277d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
@@ -32,7 +32,7 @@ import com.epmet.modules.notice.entity.NoticeEntity;
 import com.epmet.modules.notice.entity.NoticeReadRecordEntity;
 import com.epmet.modules.notice.redis.NoticeReadRecordRedis;
 import com.epmet.modules.notice.service.NoticeReadRecordService;
-import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl;
+import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.resi.group.dto.group.result.UserReadFlagResultDTO;
 import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeReadListFormDTO;
@@ -71,7 +71,7 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
     @Autowired
     private ResiGroupDao resiGroupDao;
     @Autowired
-    private ResiTopicServiceImpl topicServiceImpl;
+    private ResiTopicService topicServiceImpl;
 
     /**
      * @param formDTO
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 7a23edc9cd..ae899e3ee9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -56,10 +56,7 @@ import com.epmet.modules.topic.dao.ResiTopicDao;
 import com.epmet.modules.topic.dao.ResiTopicOperationDao;
 import com.epmet.modules.topic.dao.TopicDraftDao;
 import com.epmet.modules.topic.entity.*;
-import com.epmet.modules.topic.service.TopicDraftAttachmentService;
-import com.epmet.modules.topic.service.TopicDraftOperationService;
-import com.epmet.modules.topic.service.TopicDraftScanTaskService;
-import com.epmet.modules.topic.service.TopicDraftService;
+import com.epmet.modules.topic.service.*;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.constant.TopicConstant;
@@ -150,7 +147,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
     @Autowired
     private GroupMessageDao groupMessageDao;
     @Autowired
-    private ResiTopicServiceImpl resiTopicServiceImpl;
+    private ResiTopicService resiTopicService;
 
     @Override
     public PageData<TopicDraftDTO> page(Map<String, Object> params) {
@@ -637,7 +634,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
         if ("branch".equals(group.getGroupType())) {
             List<String> userIds = result.stream().map(m -> m.getUserName()).distinct().collect(Collectors.toList());
-            List<UserInfoResultDTO> userInfos = resiTopicServiceImpl.disPoseUserInfo(group.getGroupType(), userIds);
+            List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(group.getGroupType(), userIds);
             result.forEach(item -> {
                 userInfos.forEach(u->{
                     if(item.getUserName().equals(u.getUserId())){