123123123

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/CsMessageServiceImpl.java

@@ -267,10 +267,10 @@ public class CsMessageServiceImpl implements ICsMessageService {
             SysUser waiter = waiterMap.get(vo.getSenderId());
             if (waiter != null) {
                 vo.setSenderName(StrUtil.blankToDefault(waiter.getNickName(), waiter.getUserName()));
-                vo.setSenderAvatar(seat != null ? seat.getAvatar() : null);
-                vo.setSenderRole("waiter");
-                return;
             }
+            vo.setSenderAvatar(seat != null ? seat.getAvatar() : null);
+            vo.setSenderRole("waiter");
+            return;
         }
         if (Objects.equals(vo.getSenderType(), 3)) {
             vo.setSenderName("系统消息");