-----------

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuConversationController.java

@@ -153,8 +153,9 @@ public class AppKeFuConversationController {
     @Operation(summary = "获得客服会话列表新")
     public CommonResult<List<KeFuConversationRespVO>> getConversationListNew() {
         // 查询会话列表
+        Long me = SecurityFrameworkUtils.getLoginUserId();
         List<KeFuConversationDO> list =
-                conversationService.getConversationList(SecurityFrameworkUtils.getLoginUserId());
+                conversationService.getConversationList(me);
         
         List<KeFuConversationRespVO> respList =
                 BeanUtils.toBean(list,
@@ -163,11 +164,13 @@ public class AppKeFuConversationController {
         // 拼接数据
         Collection<Long> ids = convertSet(respList,
                 KeFuConversationRespVO::getUserId);
-       /* Collection<Long> relids = convertSet(respList,
+        Collection<Long> relids = convertSet(respList,
                 KeFuConversationRespVO::getRelUserId);
-        ids.addAll(relids);*/
+        ids.addAll(relids);
+        
         Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(ids);
-        respList.forEach(item -> findAndThen(userMap, item.getUserId(),
+        respList.forEach(item -> findAndThen(userMap, (item.getUserId().equals(me)) ? item.getRelUserId() :
+                        item.getUserId(),
                 memberUser -> item.setUserAvatar(memberUser.getAvatar()).setUserNickname(memberUser.getNickname())));
   /*      respList.forEach(item -> findAndThen(userMap, item.getRelUserId(),
                 memberUser -> item.setRelUserAvatar(memberUser.getAvatar()).setRelUserNickname(memberUser.getNickname

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java

@@ -4,13 +4,14 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageListReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageRespVO;
 import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessageSendReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
 import cn.iocoder.yudao.module.promotion.service.kefu.KeFuMessageService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -42,6 +43,8 @@ public class AppKeFuMessageController {
 
     @Resource
     private AdminUserApi adminUserApi;
+    @Resource
+    private MemberUserApi memberUserApi;
     
     @PostMapping("/send")
     @Operation(summary = "发送客服消息")
@@ -106,7 +109,7 @@ public class AppKeFuMessageController {
         ids.addAll(relids);
         // 拼接数据
         List<KeFuMessageRespVO> result = BeanUtils.toBean(list, KeFuMessageRespVO.class);
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(ids);
+        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(ids);
         result.forEach(item -> findAndThen(userMap, item.getSenderId(), user -> item.setSenderAvatar(user.getAvatar())));
         result.forEach(item -> findAndThen(userMap, item.getReceiverId(),
                 user -> item.setReceiverAvatar(user.getAvatar())));