|
|
@ -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())){ |
|
|
|