组管理界面-待审核/已驳回列表接口按组类型返人名

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

@@ -38,6 +38,7 @@ import com.epmet.commons.tools.scan.result.VoiceResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.GroupMessageDao;
@@ -148,6 +149,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
     private String voiceResultsMethod;
     @Autowired
     private GroupMessageDao groupMessageDao;
+    @Autowired
+    private ResiTopicServiceImpl resiTopicServiceImpl;
 
     @Override
     public PageData<TopicDraftDTO> page(Map<String, Object> params) {
@@ -630,13 +633,27 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         } else {
             result = baseDao.selectTopicDraftByGroup(formDTO.getGroupId(), formDTO.getStatus());
         }
-        result.forEach(item -> {
-            ResiGroupMemberInfoRedisDTO memberRedis =
-                    resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
-            if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
-                item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
-            }
-        });
+        //查询小组信息
+        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);
+            result.forEach(item -> {
+                userInfos.forEach(u->{
+                    if(item.getUserName().equals(u.getUserId())){
+                        item.setUserName(u.getReleaseUserName());
+                    }
+                });
+            });
+        } else {
+            result.forEach(item -> {
+                ResiGroupMemberInfoRedisDTO memberRedis =
+                        resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
+                if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
+                    item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
+                }
+            });
+        }
         return result;
     }