fix 单聊信息修改

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourMemberController.java

@@ -28,6 +28,7 @@ import com.tourism.webadmin.back.model.*;
 import com.tourism.webadmin.back.service.TourImGroupService;
 import com.tourism.webadmin.back.service.TourUserService;
 import com.tourism.webadmin.back.vo.TourImMemberVo;
+import com.tourism.webadmin.back.vo.TourImMessageVo;
 import com.tourism.webadmin.enums.GroupRole;
 import com.tourism.webadmin.ws.handle.SystemMessageHandler;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -359,7 +360,13 @@ public class TourMemberController {
         List<TourImMember> list1 = tourMemberService.list(query);
         if(list1.isEmpty())return ResponseResult.success(null);
         List<OneWayMemberVo> oneWayMemberVos = BeanUtil.copyToList(list1, OneWayMemberVo.class);
-        TourImMember member = list1.get(0);
+        OneWayMemberVo member = new OneWayMemberVo();
+        if (list1.size()==1) {
+            member = oneWayMemberVos.get(0);
+        }else if (list1.size()==2) {
+            List<OneWayMemberVo> collect = oneWayMemberVos.stream().filter(o -> o.getUserId().equals(my.getUserId().toString())).collect(Collectors.toList());
+            member = collect.get(0);
+        }
         //对方没创建 member  手动构建对方的member
         OneWayMemberVo tourImMember = new OneWayMemberVo();
         TourUser toUser = tourUserService.getById(member.getPartnerId());
@@ -371,13 +378,18 @@ public class TourMemberController {
             oneWayMemberVos.add(tourImMember);
         }
         for (OneWayMemberVo oneWayMemberVo : oneWayMemberVos) {
-            if(ObjectUtil.isEmpty(oneWayMemberVo.getGroupRemark())&& oneWayMemberVo.getUserId().equals(my.getUserId().toString())){
-                oneWayMemberVo.setGroupRemark(toUser.getShowName());
+            if(oneWayMemberVo.getUserId().equals(my.getUserId().toString())){
+                if (ObjectUtil.isEmpty(oneWayMemberVo.getGroupRemark())){
+                    oneWayMemberVo.setGroupRemark(toUser.getShowName());
+                }
                 oneWayMemberVo.setHeadImage(toUser.getHeadImageUrl());
-                continue;
             }
-            oneWayMemberVo.setGroupRemark(my.getShowName());
-            oneWayMemberVo.setHeadImage(my.getHeadImageUrl());
+            if(oneWayMemberVo.getPartnerId().equals(my.getUserId().toString())){
+                if (ObjectUtil.isEmpty(oneWayMemberVo.getGroupRemark())){
+                    oneWayMemberVo.setGroupRemark(my.getShowName());
+                }
+                oneWayMemberVo.setHeadImage(my.getHeadImageUrl());
+            }
         }
         return ResponseResult.success(oneWayMemberVos);
     }