diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志 b/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志
index 339cf31..7d368e8 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志
@@ -495,9 +495,19 @@ jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/components/MesXslRubber
 jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/components/MesXslRubberQuickTestMethodSelectModal.vue
 jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/components/MesXslRubberQuickTestStdMixerPsSelectModal.vue
 
--- author:jiangxh---date:20260525--for: 【MES】原材料检验标准密炼PS批准时关联胶料快检实验标准置已批准（反审核不回退，触发由审核改为批准）---
-jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/common/XslMesBizConstants.java
-jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslRubberQuickTestStdService.java
-jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslRubberQuickTestStdServiceImpl.java
 jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerPsCompileServiceImpl.java
 jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestStdController.java
+
+-- author:xsl---date:20260528--for: 【IM聊天-OA】IM群聊：创建群聊、群列表、群消息收发与未读 ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_110__sys_im_group_chat.sql
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/dto/SysImCreateGroupDTO.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/entity/SysImConversation.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/vo/SysImConversationVO.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/SysImConversationMapper.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/xml/SysImConversationMapper.xml
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/ISysImChatService.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/impl/SysImChatServiceImpl.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/controller/SysImChatController.java
+jeecgboot-vue3/src/views/system/im/im.api.ts
+jeecgboot-vue3/src/views/system/im/ImCreateGroupModal.vue
+jeecgboot-vue3/src/views/system/im/ImChat.vue
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/controller/SysImChatController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/controller/SysImChatController.java
index 5606159..9d63655 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/controller/SysImChatController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/controller/SysImChatController.java
@@ -11,6 +11,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.im.dto.SysImCreateGroupDTO;
 import org.jeecg.modules.im.dto.SysImSendMessageDTO;
 import org.jeecg.modules.im.service.ISysImChatService;
 import org.jeecg.modules.im.vo.SysImContactVO;
@@ -136,4 +137,22 @@ public class SysImChatController {
         return Result.OK(imChatService.listDeptMembers(user.getId(), resolveTenantId(user, request), user.getOrgCode(), keyword));
     }
     //update-end---author:cursor ---date:20260528  for：【IM聊天-OA】联系人接口（兼容保留，同本部门）-----------
+
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】群聊接口-----------
+    @Operation(summary = "IM聊天-群聊列表")
+    @RequiresPermissions("sys:im:chat:list")
+    @GetMapping("/groups")
+    public Result<List<SysImConversationVO>> groups(HttpServletRequest request) {
+        LoginUser user = currentUser();
+        return Result.OK(imChatService.listGroupConversations(user.getId(), resolveTenantId(user, request)));
+    }
+
+    @Operation(summary = "IM聊天-创建群聊")
+    @RequiresPermissions("sys:im:chat:group")
+    @PostMapping("/group/create")
+    public Result<SysImConversationVO> createGroup(@RequestBody SysImCreateGroupDTO dto, HttpServletRequest request) {
+        LoginUser user = currentUser();
+        return Result.OK(imChatService.createGroupConversation(user.getId(), resolveTenantId(user, request), user.getOrgCode(), dto));
+    }
+    //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】群聊接口-----------
 }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/dto/SysImCreateGroupDTO.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/dto/SysImCreateGroupDTO.java
new file mode 100644
index 0000000..33ffe96
--- /dev/null
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/dto/SysImCreateGroupDTO.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.im.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 创建 IM 群聊
+ */
+@Data
+@Schema(description = "创建IM群聊")
+public class SysImCreateGroupDTO {
+
+    @Schema(description = "群名称")
+    private String groupName;
+
+    @Schema(description = "群成员用户ID（不含本人时可自动加入创建人）")
+    private List<String> memberUserIds;
+}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/entity/SysImConversation.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/entity/SysImConversation.java
index 14ed062..3f5865b 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/entity/SysImConversation.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/entity/SysImConversation.java
@@ -20,10 +20,14 @@ public class SysImConversation implements Serializable {
 
     @TableId(type = IdType.ASSIGN_ID)
     private String id;
-    /** 会话类型 single单聊 */
+    /** 会话类型 single单聊 group群聊 */
     private String convType;
     /** 单聊唯一键 */
     private String userPairKey;
+    /** 群名称 */
+    private String groupName;
+    /** 群主用户ID */
+    private String ownerId;
     /** 租户ID */
     private Integer tenantId;
     /** 最后一条消息摘要 */
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/SysImConversationMapper.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/SysImConversationMapper.java
index 09d4b73..54c246c 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/SysImConversationMapper.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/SysImConversationMapper.java
@@ -16,4 +16,9 @@ public interface SysImConversationMapper extends BaseMapper<SysImConversation> {
      * 查询当前用户的会话列表
      */
     List<SysImConversationVO> listMyConversations(@Param("userId") String userId, @Param("tenantId") Integer tenantId);
+
+    /**
+     * 查询当前用户的群聊列表
+     */
+    List<SysImConversationVO> listMyGroupConversations(@Param("userId") String userId, @Param("tenantId") Integer tenantId);
 }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/xml/SysImConversationMapper.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/xml/SysImConversationMapper.xml
index 92eed95..5af297d 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/xml/SysImConversationMapper.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/mapper/xml/SysImConversationMapper.xml
@@ -23,4 +23,26 @@
         ORDER BY c.last_time DESC
     </select>
 
+    <select id="listMyGroupConversations" resultType="org.jeecg.modules.im.vo.SysImConversationVO">
+        SELECT
+            c.id AS conversationId,
+            c.conv_type AS convType,
+            c.group_name AS groupName,
+            c.owner_id AS ownerId,
+            c.last_content AS lastContent,
+            c.last_time AS lastTime,
+            m.unread_count AS unreadCount,
+            (
+                SELECT COUNT(1)
+                FROM sys_im_conversation_member gm
+                WHERE gm.conversation_id = c.id
+            ) AS memberCount
+        FROM sys_im_conversation_member m
+        INNER JOIN sys_im_conversation c ON c.id = m.conversation_id
+        WHERE m.user_id = #{userId}
+          AND c.tenant_id = #{tenantId}
+          AND c.conv_type = 'group'
+        ORDER BY c.last_time DESC
+    </select>
+
 </mapper>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/ISysImChatService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/ISysImChatService.java
index 3440ec7..0e1c580 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/ISysImChatService.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/ISysImChatService.java
@@ -4,6 +4,7 @@ package org.jeecg.modules.im.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import org.jeecg.modules.im.dto.SysImCreateGroupDTO;
 import org.jeecg.modules.im.dto.SysImSendMessageDTO;
 
 import org.jeecg.modules.im.vo.SysImContactVO;
@@ -34,7 +35,9 @@ public interface ISysImChatService {
 
     SysImConversationVO openSingleConversation(String userId, Integer tenantId, String orgCode, String targetUserId);
 
+    List<SysImConversationVO> listGroupConversations(String userId, Integer tenantId);
 
+    SysImConversationVO createGroupConversation(String userId, Integer tenantId, String orgCode, SysImCreateGroupDTO dto);
 
     IPage<SysImMessageVO> listMessages(String userId, String conversationId, Integer pageNo, Integer pageSize, String startTime, String beforeTime);
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/impl/SysImChatServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/impl/SysImChatServiceImpl.java
index c9eeba9..a7d761f 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/impl/SysImChatServiceImpl.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/service/impl/SysImChatServiceImpl.java
@@ -9,6 +9,7 @@ import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.im.dto.SysImCreateGroupDTO;
 import org.jeecg.modules.im.dto.SysImSendMessageDTO;
 import org.jeecg.modules.im.entity.SysImConversation;
 import org.jeecg.modules.im.entity.SysImConversationMember;
@@ -41,6 +42,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -51,6 +54,7 @@ import java.util.stream.Collectors;
 public class SysImChatServiceImpl implements ISysImChatService {
 
     private static final String CONV_TYPE_SINGLE = "single";
+    private static final String CONV_TYPE_GROUP = "group";
     private static final String MSG_TYPE_TEXT = "text";
     private static final String MSG_TYPE_IMAGE = "image";
     private static final String MSG_TYPE_BIZ_RECORD = "biz_record";
@@ -116,6 +120,84 @@ public class SysImChatServiceImpl implements ISysImChatService {
     }
     //update-end---author:cursor ---date:20260528  for：【IM聊天-OA】打开单聊会话-----------
 
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】群聊会话列表与创建-----------
+    @Override
+    public List<SysImConversationVO> listGroupConversations(String userId, Integer tenantId) {
+        if (oConvertUtils.isEmpty(userId) || tenantId == null || tenantId <= 0) {
+            return Collections.emptyList();
+        }
+        return conversationMapper.listMyGroupConversations(userId, tenantId);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SysImConversationVO createGroupConversation(String userId, Integer tenantId, String orgCode, SysImCreateGroupDTO dto) {
+        if (dto == null || oConvertUtils.isEmpty(dto.getGroupName())) {
+            throw new JeecgBootException("群名称不能为空");
+        }
+        String groupName = dto.getGroupName().trim();
+        if (groupName.length() > 30) {
+            throw new JeecgBootException("群名称不能超过30字");
+        }
+        List<String> memberIds = normalizeGroupMemberIds(userId, dto.getMemberUserIds());
+        if (memberIds.size() < 2) {
+            throw new JeecgBootException("群聊至少需要2名成员");
+        }
+        if (memberIds.size() > 50) {
+            throw new JeecgBootException("群成员不能超过50人");
+        }
+        for (String memberId : memberIds) {
+            if (userId.equals(memberId)) {
+                continue;
+            }
+            validateTenantChat(userId, tenantId, orgCode, memberId);
+        }
+        Date now = new Date();
+        SysImConversation conversation = new SysImConversation();
+        conversation.setConvType(CONV_TYPE_GROUP);
+        conversation.setGroupName(groupName);
+        conversation.setOwnerId(userId);
+        conversation.setTenantId(tenantId);
+        conversation.setCreateBy(userId);
+        conversation.setCreateTime(now);
+        conversation.setUpdateTime(now);
+        conversationMapper.insert(conversation);
+        for (String memberId : memberIds) {
+            createMember(conversation.getId(), memberId, now);
+        }
+        return buildGroupConversationVo(conversation, userId);
+    }
+
+    private List<String> normalizeGroupMemberIds(String creatorId, List<String> memberUserIds) {
+        Set<String> memberIds = new LinkedHashSet<>();
+        memberIds.add(creatorId);
+        if (memberUserIds != null) {
+            for (String memberId : memberUserIds) {
+                if (oConvertUtils.isNotEmpty(memberId)) {
+                    memberIds.add(memberId);
+                }
+            }
+        }
+        return new ArrayList<>(memberIds);
+    }
+
+    private SysImConversationVO buildGroupConversationVo(SysImConversation conversation, String userId) {
+        SysImConversationMember member = getMember(userId, conversation.getId());
+        SysImConversationVO vo = new SysImConversationVO();
+        vo.setConversationId(conversation.getId());
+        vo.setConvType(CONV_TYPE_GROUP);
+        vo.setGroupName(conversation.getGroupName());
+        vo.setOwnerId(conversation.getOwnerId());
+        vo.setLastContent(conversation.getLastContent());
+        vo.setLastTime(conversation.getLastTime());
+        vo.setUnreadCount(member == null ? 0 : member.getUnreadCount());
+        Long memberCount = memberMapper.selectCount(new LambdaQueryWrapper<SysImConversationMember>()
+                .eq(SysImConversationMember::getConversationId, conversation.getId()));
+        vo.setMemberCount(memberCount == null ? 0 : memberCount.intValue());
+        return vo;
+    }
+    //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】群聊会话列表与创建-----------
+
     //update-begin---author:cursor ---date:20260528  for：【IM聊天-OA】消息分页-----------
     @Override
     public IPage<SysImMessageVO> listMessages(String userId, String conversationId, Integer pageNo, Integer pageSize, String startTime, String beforeTime) {
@@ -179,7 +261,15 @@ public class SysImChatServiceImpl implements ISysImChatService {
 
         SysImConversation conversation = conversationMapper.selectById(dto.getConversationId());
         //update-begin---author:cursor ---date:20260528  for：【IM聊天-OA】图片消息会话摘要-----------
-        conversation.setLastContent(truncate(resolveLastContent(message.getMsgType(), message.getContent()), 200));
+        String lastContent = resolveLastContent(message.getMsgType(), message.getContent());
+        if (CONV_TYPE_GROUP.equals(conversation.getConvType())) {
+            SysUser sender = userMapper.selectById(userId);
+            String senderName = sender != null ? oConvertUtils.getString(sender.getRealname(), sender.getUsername()) : "";
+            if (oConvertUtils.isNotEmpty(senderName)) {
+                lastContent = senderName + ": " + lastContent;
+            }
+        }
+        conversation.setLastContent(truncate(lastContent, 200));
         //update-end---author:cursor ---date:20260528  for：【IM聊天-OA】图片消息会话摘要-----------
         conversation.setLastTime(now);
         conversation.setUpdateTime(now);
@@ -188,7 +278,7 @@ public class SysImChatServiceImpl implements ISysImChatService {
         memberMapper.incrementUnreadExceptSender(dto.getConversationId(), userId);
         SysImMessageVO messageVo = toMessageVo(message, userId);
         fillBizRecordReceiverPermission(messageVo, message, userId, new HashMap<>(4));
-        pushChatMessage(dto.getConversationId(), userId, messageVo);
+        pushChatMessage(dto.getConversationId(), userId, messageVo, conversation.getConvType());
         return messageVo;
     }
     //update-end---author:cursor ---date:20260528  for：【IM聊天-OA】发送消息-----------
@@ -422,6 +512,10 @@ public class SysImChatServiceImpl implements ISysImChatService {
         if (!Boolean.TRUE.equals(vo.getMine()) || !MSG_TYPE_BIZ_RECORD.equals(vo.getMsgType())) {
             return;
         }
+        SysImConversation conversation = conversationMapper.selectById(message.getConversationId());
+        if (conversation == null || !CONV_TYPE_SINGLE.equals(conversation.getConvType())) {
+            return;
+        }
         String pagePath = extractBizRecordPagePath(vo.getContent());
         if (oConvertUtils.isEmpty(pagePath)) {
             return;
@@ -509,7 +603,7 @@ public class SysImChatServiceImpl implements ISysImChatService {
     //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】发送方提示接收方无功能权限-----------
     //update-end---author:cursor ---date:20260528  for：【IM聊天-OA】消息列表批量填充发送人-----------
 
-    private void pushChatMessage(String conversationId, String senderId, SysImMessageVO messageVo) {
+    private void pushChatMessage(String conversationId, String senderId, SysImMessageVO messageVo, String convType) {
         List<SysImConversationMember> members = memberMapper.selectList(new LambdaQueryWrapper<SysImConversationMember>()
                 .eq(SysImConversationMember::getConversationId, conversationId));
         for (SysImConversationMember member : members) {
@@ -520,6 +614,9 @@ public class SysImChatServiceImpl implements ISysImChatService {
             obj.put(WebsocketConst.MSG_CMD, WebsocketConst.MSG_CHAT);
             obj.put(WebsocketConst.MSG_USER_ID, member.getUserId());
             obj.put("conversationId", conversationId);
+            //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】WebSocket推送会话类型区分群聊-----------
+            obj.put("convType", convType);
+            //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】WebSocket推送会话类型区分群聊-----------
             obj.put("messageId", messageVo.getId());
             obj.put("senderId", messageVo.getSenderId());
             //update-begin---author:cursor ---date:20260528  for：【IM聊天-OA】WebSocket推送补全头像字段-----------
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/vo/SysImConversationVO.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/vo/SysImConversationVO.java
index 96997df..1596d44 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/vo/SysImConversationVO.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/im/vo/SysImConversationVO.java
@@ -34,4 +34,10 @@ public class SysImConversationVO {
     private String targetUsername;
     @Schema(description = "对方头像")
     private String targetAvatar;
+    @Schema(description = "群名称")
+    private String groupName;
+    @Schema(description = "群成员数")
+    private Integer memberCount;
+    @Schema(description = "群主用户ID")
+    private String ownerId;
 }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_110__sys_im_group_chat.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_110__sys_im_group_chat.sql
new file mode 100644
index 0000000..cc15bca
--- /dev/null
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_110__sys_im_group_chat.sql
@@ -0,0 +1,22 @@
+-- IM 群聊：扩展会话表字段
+SET NAMES utf8mb4;
+
+ALTER TABLE `sys_im_conversation`
+  ADD COLUMN `group_name` varchar(100) DEFAULT NULL COMMENT '群名称' AFTER `user_pair_key`,
+  ADD COLUMN `owner_id` varchar(32) DEFAULT NULL COMMENT '群主用户ID' AFTER `group_name`;
+
+ALTER TABLE `sys_im_conversation`
+  MODIFY COLUMN `conv_type` varchar(10) NOT NULL DEFAULT 'single' COMMENT '会话类型 single单聊 group群聊';
+
+INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
+VALUES ('1995000000000000113', '1995000000000000110', '创建群聊', 2, 'sys:im:chat:group', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW());
+
+INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1'
+FROM `sys_role` r
+CROSS JOIN `sys_permission` p
+WHERE r.`role_code` = 'admin'
+  AND p.`id` = '1995000000000000113'
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );
diff --git a/jeecgboot-vue3/src/hooks/web/useWebSocket.ts b/jeecgboot-vue3/src/hooks/web/useWebSocket.ts
index 1b31be6..91c6cd6 100644
--- a/jeecgboot-vue3/src/hooks/web/useWebSocket.ts
+++ b/jeecgboot-vue3/src/hooks/web/useWebSocket.ts
@@ -10,6 +10,15 @@ import { useUserStore } from '/@/store/modules/user';
 let result: WebSocketResult<any>;
 const listeners = new Map();
 let connectedUrl = '';
+//update-begin---author:xsl ---date:20260528 for：【IM聊天】WS 重连后通知监听方重新拉取消息-----------
+let wsConnectionCount = 0;
+const reconnectListeners = new Set<() => void>();
+
+export function onWebSocketReconnect(callback: () => void) {
+  reconnectListeners.add(callback);
+  return () => reconnectListeners.delete(callback);
+}
+//update-end---author:xsl ---date:20260528 for：【IM聊天】WS 重连后通知监听方重新拉取消息-----------
 
 /**
  * 构建系统 WebSocket 地址（含 context-path，如 /jeecg-boot）
@@ -67,7 +76,15 @@ export function connectWebSocket(url: string) {
     protocols: [token],
     // 代码逻辑说明: [issues/6662] 演示系统socket总断，换一个写法
     onConnected: function (ws) {
+      wsConnectionCount++;
       console.log('[WebSocket] 连接成功', ws);
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】WS 重连后通知监听方重新拉取消息-----------
+      if (wsConnectionCount > 1) {
+        reconnectListeners.forEach((cb) => {
+          try { cb(); } catch (err) { console.error(err); }
+        });
+      }
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】WS 重连后通知监听方重新拉取消息-----------
     },
     onDisconnected: function (ws, event) {
       console.log('[WebSocket] 连接断开：', ws, event);
diff --git a/jeecgboot-vue3/src/views/system/im/ImChat.vue b/jeecgboot-vue3/src/views/system/im/ImChat.vue
index c990296..b4a958a 100644
--- a/jeecgboot-vue3/src/views/system/im/ImChat.vue
+++ b/jeecgboot-vue3/src/views/system/im/ImChat.vue
@@ -13,7 +13,23 @@
             </button>
           </a-tooltip>
         </div>
-        <div v-show="!leftCollapsed" class="im-search-wrap">
+        <!--update-begin---author:xsl ---date:20260528 for：【IM聊天】tab 加未读角标------------->
+        <div v-show="!leftCollapsed" class="im-left-tabs">
+          <button type="button" :class="['im-left-tab', { active: leftListTab === 'member' }]" @click="leftListTab = 'member'">
+            同事
+            <span v-if="memberTabUnread > 0" class="tab-unread-badge">
+              {{ memberTabUnread > 99 ? '99+' : memberTabUnread }}
+            </span>
+          </button>
+          <button type="button" :class="['im-left-tab', { active: leftListTab === 'group' }]" @click="switchToGroupTab">
+            群聊
+            <span v-if="groupTabUnread > 0" class="tab-unread-badge">
+              {{ groupTabUnread > 99 ? '99+' : groupTabUnread }}
+            </span>
+          </button>
+        </div>
+        <!--update-end---author:xsl ---date:20260528 for：【IM聊天】tab 加未读角标----------->
+        <div v-show="!leftCollapsed && leftListTab === 'member'" class="im-search-wrap">
           <a-input
             v-model:value="memberKeyword"
             placeholder="搜索同事"
@@ -27,8 +43,15 @@
             </template>
           </a-input>
         </div>
-        <a-spin :spinning="memberLoading" class="left-spin">
+        <div v-show="!leftCollapsed && leftListTab === 'group'" class="im-group-actions">
+          <a-button type="primary" size="small" block @click="handleOpenCreateGroupModal">
+            <Icon icon="ant-design:plus-outlined" />
+            发起群聊
+          </a-button>
+        </div>
+        <a-spin :spinning="leftListTab === 'group' ? groupLoading : memberLoading" class="left-spin">
           <div class="conv-list">
+            <template v-if="leftListTab === 'member'">
             <a-tooltip
               v-for="item in deptMembers"
               :key="item.id"
@@ -56,6 +79,36 @@
               </div>
             </a-tooltip>
             <a-empty v-if="!deptMembers.length && !leftCollapsed" description="本部门暂无其他同事" />
+            </template>
+            <template v-else>
+              <a-tooltip
+                v-for="item in groupList"
+                :key="item.conversationId"
+                :title="leftCollapsed ? item.groupName : ''"
+                placement="right"
+              >
+                <div
+                  :class="['conv-item', activeGroup?.conversationId === item.conversationId ? 'active' : '']"
+                  @click="selectGroup(item)"
+                >
+                  <a-badge :count="shouldShowGroupUnread(item) ? item.unreadCount : 0" :offset="[-2, 2]">
+                    <a-avatar :size="leftCollapsed ? 36 : 40" :style="{ backgroundColor: '#1677ff' }">
+                      <Icon icon="ant-design:team-outlined" />
+                    </a-avatar>
+                  </a-badge>
+                  <div v-show="!leftCollapsed" class="conv-meta">
+                    <div class="conv-top">
+                      <span class="conv-name">{{ item.groupName }}</span>
+                      <span class="conv-time">{{ formatTime(item.lastTime) }}</span>
+                    </div>
+                    <div class="conv-bottom">
+                      <span class="conv-preview">{{ formatConvPreview(item.lastContent) }}</span>
+                    </div>
+                  </div>
+                </div>
+              </a-tooltip>
+              <a-empty v-if="!groupList.length && !leftCollapsed" description="暂无群聊，点击上方发起群聊" />
+            </template>
           </div>
         </a-spin>
       </aside>
@@ -70,7 +123,7 @@
       <main class="im-chat-right">
         <div class="im-chat-right-header">
           <span class="chat-peer-name">
-            {{ activeMember ? activeMember.realname || activeMember.username : 'IM聊天' }}
+            {{ activeChatTitle }}
           </span>
           <a-dropdown :trigger="['click']" placement="bottomRight">
             <button type="button" class="chat-settings-btn" @click.prevent>
@@ -83,46 +136,56 @@
             </template>
           </a-dropdown>
         </div>
-        <template v-if="activeMember">
-          <div ref="messageBoxRef" class="message-box" @scroll="handleMessageBoxScroll">
-            <div v-if="msgLoading && messageList.length" class="load-more-hint">
-              <a-spin size="small" />
-              <span>加载更早的消息...</span>
-            </div>
-            <div v-else-if="hasMore && !messageList.length" class="load-more">
-              <a-button type="link" size="small" :loading="msgLoading" @click="loadMoreMessages">查看更早的消息</a-button>
-            </div>
-            <div v-for="msg in messageList" :key="msg.id" :class="['message-row', msg.mine ? 'mine' : 'other']">
-              <a-avatar :size="32" :src="getAvatarUrl(msg.senderAvatar)">
-                {{ (msg.senderName || '?').slice(0, 1) }}
-              </a-avatar>
-              <div
-                class="message-bubble"
-                :class="{
-                  'message-bubble--image': isImImageMessage(msg.msgType),
-                  'message-bubble--biz-record': isImBizRecordMessage(msg.msgType),
-                }"
-              >
-                <div class="message-name" v-if="!msg.mine">{{ msg.senderName }}</div>
-                <img
-                  v-if="isImImageMessage(msg.msgType)"
-                  class="message-image"
-                  :src="getAvatarUrl(msg.content)"
-                  alt="图片消息"
-                  @click="openImagePreview(msg.content)"
-                />
-                <div v-else-if="isImTextMessage(msg.msgType)" class="message-content">{{ renderMessageText(msg.content) }}</div>
-                <ImBizRecordMessageContent
-                  v-else-if="isImBizRecordMessage(msg.msgType) && getBizRecordPayload(msg.content)"
-                  :payload="getBizRecordPayload(msg.content)!"
-                  :mine="msg.mine"
-                  :receiver-has-biz-page-permission="msg.receiverHasBizPagePermission"
-                />
-                <div v-else class="message-content">{{ msg.content }}</div>
-                <div class="message-time">{{ formatTime(msg.createTime) }}</div>
+        <template v-if="activeMember || activeGroup">
+          <!--update-begin---author:xsl ---date:20260528 for：【IM聊天】添加新消息提示按钮容器------------->
+          <div class="message-box-wrap">
+            <div ref="messageBoxRef" class="message-box" @scroll="handleMessageBoxScroll">
+              <div v-if="msgLoading && messageList.length" class="load-more-hint">
+                <a-spin size="small" />
+                <span>加载更早的消息...</span>
+              </div>
+              <div v-else-if="hasMore && !messageList.length" class="load-more">
+                <a-button type="link" size="small" :loading="msgLoading" @click="loadMoreMessages">查看更早的消息</a-button>
+              </div>
+              <div v-for="msg in messageList" :key="msg.id" :class="['message-row', msg.mine ? 'mine' : 'other']">
+                <a-avatar :size="32" :src="getAvatarUrl(msg.senderAvatar)">
+                  {{ (msg.senderName || '?').slice(0, 1) }}
+                </a-avatar>
+                <div
+                  class="message-bubble"
+                  :class="{
+                    'message-bubble--image': isImImageMessage(msg.msgType),
+                    'message-bubble--biz-record': isImBizRecordMessage(msg.msgType),
+                  }"
+                >
+                  <div class="message-name" v-if="isGroupChat || !msg.mine">{{ msg.senderName }}</div>
+                  <img
+                    v-if="isImImageMessage(msg.msgType)"
+                    class="message-image"
+                    :src="getAvatarUrl(msg.content)"
+                    alt="图片消息"
+                    @click="openImagePreview(msg.content)"
+                  />
+                  <div v-else-if="isImTextMessage(msg.msgType)" class="message-content">{{ renderMessageText(msg.content) }}</div>
+                  <ImBizRecordMessageContent
+                    v-else-if="isImBizRecordMessage(msg.msgType) && getBizRecordPayload(msg.content)"
+                    :payload="getBizRecordPayload(msg.content)!"
+                    :mine="msg.mine"
+                    :receiver-has-biz-page-permission="msg.receiverHasBizPagePermission"
+                  />
+                  <div v-else class="message-content">{{ msg.content }}</div>
+                  <div class="message-time">{{ formatTime(msg.createTime) }}</div>
+                </div>
               </div>
             </div>
+            <transition name="new-msg-tip-fade">
+              <div v-if="pendingNewMsgCount > 0" class="new-msg-tip" @click="scrollToBottom">
+                <Icon icon="ant-design:arrow-down-outlined" />
+                {{ pendingNewMsgCount }} 条新消息
+              </div>
+            </transition>
           </div>
+          <!--update-end---author:xsl ---date:20260528 for：【IM聊天】添加新消息提示按钮容器----------->
           <div class="message-input">
             <!--update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗输入框上方展示背后功能页名称------------->
             <div
@@ -145,11 +208,12 @@
             />
           </div>
         </template>
-        <a-empty v-else class="empty-chat" description="请从左侧选择本部门同事开始聊天" />
+        <a-empty v-else class="empty-chat" description="请从左侧选择同事或群聊开始聊天" />
       </main>
     </div>
     <ImChatSettingsModal @register="registerSettingsModal" @saved="onChatSettingsSaved" />
     <ImPageListPickModal @register="registerListPickModal" @confirm="handleListRowsSend" />
+    <ImCreateGroupModal @register="registerCreateGroupModal" @success="handleGroupCreated" />
     <a-modal :open="previewVisible" :footer="null" width="720px" @cancel="closeImagePreview">
       <img alt="图片预览" style="width: 100%" :src="previewImageUrl" />
     </a-modal>
@@ -159,10 +223,10 @@
 <script lang="ts" setup>
   import { computed, nextTick, onActivated, onDeactivated, onMounted, onUnmounted, ref } from 'vue';
   import dayjs from 'dayjs';
-  import { ensureWebSocketConnected, onWebSocket, offWebSocket } from '/@/hooks/web/useWebSocket';
+  import { ensureWebSocketConnected, onWebSocketReconnect } from '/@/hooks/web/useWebSocket';
   import { useUserStore } from '/@/store/modules/user';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-  import { fetchDeptMembers, openConversation, fetchMessages, sendMessage, markRead } from './im.api';
+  import { fetchDeptMembers, fetchGroups, openConversation, fetchMessages, sendMessage, markRead, type ImGroupConversation } from './im.api';
   import { getImDefaultHistoryDays, getImDefaultStartTime, isWithinDefaultHistoryRange } from './imSettings';
   import {
     formatImMessagePreview,
@@ -178,6 +242,7 @@
   import ImChatSettingsModal from './ImChatSettingsModal.vue';
   import ImPageListPickModal from './ImPageListPickModal.vue';
   import ImBizRecordMessageContent from './ImBizRecordMessageContent.vue';
+  import ImCreateGroupModal from './ImCreateGroupModal.vue';
   import { useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { buildImBizRecordPayload, parseImBizRecordPayload, serializeImBizRecordPayload } from './imBizRecordMessage';
@@ -199,12 +264,17 @@
     clearImActiveSession,
     isImChatWindowOpen,
     onImMessagesUpdated,
+    onImChatSocketUi,
     onImChatWindowOpenChange,
+    initGroupUnreadFromList,
+    resetGroupUnread,
+    reactiveGroupUnreadCount,
   } from './imCache';
   import {
     setImChatPageActive,
     isImChatPageActive,
     onImOpenTargetRequest,
+    onImOpenGroupRequest,
     useImPageContext,
   } from './imSession';
 
@@ -222,8 +292,12 @@
 
   interface DeptMemberItem extends ImMemberItem {}
 
+  interface GroupItem extends ImGroupConversation {}
+
   interface MessageItem extends ImMessageItem {}
 
+  type ChatType = 'single' | 'group';
+
   const userStore = useUserStore();
   const pageTabActive = ref(true);
   //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗输入框上方展示背后功能页名称-----------
@@ -249,16 +323,148 @@
   });
   //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗输入框上方展示背后功能页名称-----------
   let unsubscribeMessagesUpdated: (() => void) | null = null;
+  let unsubscribeChatSocketUi: (() => void) | null = null;
   let unsubscribeChatWindowOpen: (() => void) | null = null;
   let unsubscribeOpenTarget: (() => void) | null = null;
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】WS 重连后重新拉取消息，防止断线期间丢消息-----------
+  let unsubscribeWsReconnect: (() => void) | null = null;
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】WS 重连后重新拉取消息，防止断线期间丢消息-----------
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】从消息提醒直接打开群聊-----------
+  let unsubscribeOpenGroup: (() => void) | null = null;
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】从消息提醒直接打开群聊-----------
 
   //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗与全页互斥，统一会话激活判断-----------
   /** 当前实例是否处于前台可交互状态（全页与弹窗同一套逻辑，同一时刻仅一个实例激活） */
-  function isThisInstanceActive() {
+  function isForegroundImInstance() {
     if (props.embedded) {
-      return isImChatWindowOpen() && !isImChatPageActive();
+      return isImChatWindowOpen();
     }
-    return isImChatPageActive() && pageTabActive.value;
+    // 弹窗打开时，全页 IM 实例让位，避免双实例抢 WS
+    return isImChatPageActive() && !isImChatWindowOpen();
+  }
+
+  function isThisInstanceActive() {
+    return isForegroundImInstance();
+  }
+
+  function shouldRenderIncomingOnThisInstance() {
+    return isForegroundImInstance();
+  }
+
+  function getActiveSingleChatPeerId() {
+    return activeTargetUserId.value || activeMember.value?.id || '';
+  }
+
+  function syncConversationSidebarFromCache(conversationId: string) {
+    if (!conversationId || !isForegroundImInstance()) {
+      return;
+    }
+    const cached = getCachedMessages(conversationId);
+    const latest = cached?.records?.[cached.records.length - 1];
+    if (!latest) {
+      return;
+    }
+    const preview = formatImMessagePreview(latest.content, latest.msgType);
+    if (activeChatType.value === 'group' && activeGroup.value?.conversationId === conversationId) {
+      patchGroup(
+        conversationId,
+        {
+          lastContent: preview,
+          lastTime: latest.createTime,
+          unreadCount: 0,
+        },
+        { moveToTop: true },
+      );
+      return;
+    }
+    const peerId = getActiveSingleChatPeerId();
+    if (peerId) {
+      patchDeptMember(
+        peerId,
+        {
+          conversationId,
+          lastContent: preview,
+          lastTime: latest.createTime,
+          unreadCount: 0,
+        },
+        { moveToTop: true },
+      );
+    }
+  }
+
+  function shouldSyncConversationCache(conversationId: string) {
+    if (!conversationId) {
+      return false;
+    }
+    if (conversationId === activeConversationId.value) {
+      return true;
+    }
+    const cached = getCachedMessages(conversationId);
+    const latest = cached?.records?.[cached.records.length - 1];
+    if (!latest) {
+      return false;
+    }
+    if (activeChatType.value === 'group') {
+      return activeGroup.value?.conversationId === conversationId;
+    }
+    return isViewingSingleChatPeer(latest.senderId);
+  }
+
+  function isViewingSingleChatPeer(senderId: string) {
+    if (activeChatType.value === 'group' || !senderId) {
+      return false;
+    }
+    return getActiveSingleChatPeerId() === senderId;
+  }
+
+  /** 单聊会话 ID 可能与侧栏缓存不一致，需同时按会话 ID 与对方用户 ID 判断 */
+  function resolveIsCurrentConversation(conversationId: string, senderId: string, isGroupMessage: boolean) {
+    if (!conversationId) {
+      return false;
+    }
+    if (conversationId === activeConversationId.value) {
+      return true;
+    }
+    if (!isGroupMessage && isViewingSingleChatPeer(senderId)) {
+      return true;
+    }
+    return false;
+  }
+
+  function alignActiveConversationId(conversationId: string) {
+    if (!conversationId || conversationId === activeConversationId.value) {
+      return;
+    }
+    activeConversationId.value = conversationId;
+    syncGlobalActiveSession();
+  }
+
+  /** 将会话激活状态同步到全局缓存，供 handleImChatSocket / 角标 使用 */
+  function syncGlobalActiveSession() {
+    if (activeConversationId.value) {
+      setImActiveConversationId(activeConversationId.value);
+    }
+    if (activeTargetUserId.value) {
+      setImActiveTargetUserId(activeTargetUserId.value);
+    }
+  }
+
+  /** 合并消息列表（按 id 去重，保留 WS 刚到达但 API 尚未返回的消息） */
+  function mergeMessageLists(current: MessageItem[], incoming: MessageItem[]) {
+    const map = new Map<string, MessageItem>();
+    for (const item of current) {
+      if (item?.id) {
+        map.set(item.id, item);
+      }
+    }
+    for (const item of incoming) {
+      if (item?.id) {
+        map.set(item.id, item);
+      }
+    }
+    return Array.from(map.values()).sort(
+      (a, b) => dayjs(a.createTime || 0).valueOf() - dayjs(b.createTime || 0).valueOf(),
+    );
   }
 
   /** 从共享缓存同步当前会话消息（弹窗与全页 IM 双实例同步） */
@@ -270,7 +476,8 @@
     if (!cached?.records.length) {
       return;
     }
-    messageList.value = filterDefaultRangeMessages(cached.records);
+    const filtered = filterDefaultRangeMessages(cached.records);
+    messageList.value = mergeMessageLists(messageList.value, filtered);
     updateHasMore(messageList.value);
     nextTick(() => scrollToBottom());
   }
@@ -280,6 +487,7 @@
     if (!activeConversationId.value) {
       return;
     }
+    syncGlobalActiveSession();
     syncMessagesFromCache();
     if (hasNewerMessagesThanCache(activeConversationId.value)) {
       loadMessages(true, { forceRefresh: true });
@@ -289,6 +497,7 @@
   const [registerSettingsModal, { openModal: openSettingsModal }] = useModal();
   //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】点击功能名气泡选择列表明细发送-----------
   const [registerListPickModal, { openModal: openListPickModal }] = useModal();
+  const [registerCreateGroupModal, { openModal: openCreateGroupModal }] = useModal();
   //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】点击功能名气泡选择列表明细发送-----------
   const defaultHistoryDays = ref(getImDefaultHistoryDays());
   const currentUserId = computed(() => userStore.getUserInfo?.id || '');
@@ -302,6 +511,10 @@
   const sending = ref(false);
   const previewVisible = ref(false);
   const previewImageUrl = ref('');
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】滚动到底部检测 + 新消息提示-----------
+  const isNearBottom = ref(true);
+  const pendingNewMsgCount = ref(0);
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】滚动到底部检测 + 新消息提示-----------
 
   function renderMessageText(content?: string) {
     return resolveImEmojiText(content);
@@ -318,11 +531,16 @@
     return formatImMessagePreview(content);
   }
   const memberKeyword = ref('');
+  const leftListTab = ref<'member' | 'group'>('member');
   const draft = ref('');
   const deptMembers = ref<DeptMemberItem[]>([]);
+  const groupList = ref<GroupItem[]>([]);
+  const groupLoading = ref(false);
   const messageList = ref<MessageItem[]>([]);
   const activeTargetUserId = ref('');
   const activeMember = ref<DeptMemberItem | null>(null);
+  const activeGroup = ref<GroupItem | null>(null);
+  const activeChatType = ref<ChatType | ''>('');
   const activeConversationId = ref('');
   const messageBoxRef = ref<HTMLElement>();
   const pageSize = 20;
@@ -348,6 +566,45 @@
     width: `${leftCollapsed.value ? COLLAPSED_WIDTH : leftWidth.value}px`,
   }));
 
+  const isGroupChat = computed(() => activeChatType.value === 'group');
+
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】左侧 tab 汇总未读数-----------
+  const memberTabUnread = computed(() =>
+    deptMembers.value.reduce((sum, item) => sum + (item.unreadCount || 0), 0),
+  );
+  const groupTabUnread = computed(() => {
+    // 群聊列表已加载：从列表本地状态计算（最准确）
+    if (groupList.value.length > 0) {
+      return groupList.value.reduce((sum, item) => sum + (item.unreadCount || 0), 0);
+    }
+    // 列表未加载：从全局响应式缓存读取（WS 消息实时累加的）
+    return reactiveGroupUnreadCount.value;
+  });
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】左侧 tab 汇总未读数-----------
+
+  const activeChatTitle = computed(() => {
+    if (activeGroup.value) {
+      const count = activeGroup.value.memberCount ? `(${activeGroup.value.memberCount}人)` : '';
+      return `${activeGroup.value.groupName || '群聊'}${count}`;
+    }
+    if (activeMember.value) {
+      return activeMember.value.realname || activeMember.value.username || 'IM聊天';
+    }
+    return 'IM聊天';
+  });
+
+  function syncAllUnread() {
+    const merged = [
+      ...deptMembers.value,
+      ...groupList.value.map((item) => ({
+        id: item.conversationId,
+        conversationId: item.conversationId,
+        unreadCount: item.unreadCount,
+      })),
+    ];
+    syncImUnreadFromMembers(merged);
+  }
+
   function loadLeftPanelPreference() {
     const savedWidth = Number(localStorage.getItem(LEFT_WIDTH_KEY));
     if (!Number.isNaN(savedWidth) && savedWidth >= MIN_LEFT_WIDTH && savedWidth <= MAX_LEFT_WIDTH) {
@@ -437,7 +694,7 @@
   /** 会话摘要时间晚于本地缓存最新消息时，需要拉取服务端 */
   function hasNewerMessagesThanCache(conversationId: string) {
     const cached = getCachedMessages(conversationId);
-    const lastMemberTime = activeMember.value?.lastTime;
+    const lastMemberTime = getActiveSummaryLastTime();
     if (!lastMemberTime) {
       return false;
     }
@@ -496,6 +753,7 @@
         setCachedMembers(deptMembers.value);
       }
       syncImUnreadFromMembers(deptMembers.value);
+      syncAllUnread();
       syncActiveMember();
       applyActiveSessionReadState();
     } finally {
@@ -510,6 +768,134 @@
     return (item.unreadCount || 0) > 0 && activeTargetUserId.value !== item.id;
   }
 
+  function shouldShowGroupUnread(item: GroupItem) {
+    return (item.unreadCount || 0) > 0 && activeGroup.value?.conversationId !== item.conversationId;
+  }
+
+  async function loadGroups(force = false) {
+    if (groupLoading.value) {
+      return;
+    }
+    groupLoading.value = true;
+    try {
+      groupList.value = ((await fetchGroups()) || []) as GroupItem[];
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】loadGroups 后同步群聊未读到全局缓存，保证角标准确-----------
+      initGroupUnreadFromList(groupList.value);
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】loadGroups 后同步群聊未读到全局缓存，保证角标准确-----------
+      syncAllUnread();
+    } finally {
+      groupLoading.value = false;
+    }
+  }
+
+  function switchToGroupTab() {
+    leftListTab.value = 'group';
+    if (!groupList.value.length) {
+      loadGroups();
+    }
+  }
+
+  function patchGroup(
+    conversationId: string,
+    patch: Partial<GroupItem>,
+    options?: { moveToTop?: boolean; unreadIncrement?: number },
+  ) {
+    const index = groupList.value.findIndex((item) => item.conversationId === conversationId);
+    if (index < 0) {
+      return;
+    }
+    const current = groupList.value[index];
+    const updated: GroupItem = {
+      ...current,
+      ...patch,
+    };
+    if (options?.unreadIncrement) {
+      updated.unreadCount = (current.unreadCount || 0) + options.unreadIncrement;
+    }
+    const list = groupList.value.slice();
+    list.splice(index, 1);
+    if (options?.moveToTop !== false) {
+      list.unshift(updated);
+    } else {
+      list.splice(index, 0, updated);
+    }
+    groupList.value = list;
+    syncAllUnread();
+    if (activeGroup.value?.conversationId === conversationId) {
+      activeGroup.value = { ...activeGroup.value, ...updated };
+    }
+  }
+
+  function patchActiveConversationSummary(preview: string, time?: string) {
+    if (activeChatType.value === 'group' && activeGroup.value) {
+      patchGroup(activeGroup.value.conversationId, {
+        lastContent: preview,
+        lastTime: time,
+        unreadCount: 0,
+      }, { moveToTop: true });
+      return;
+    }
+    const peerId = getActiveSingleChatPeerId();
+    if (peerId) {
+      patchDeptMember(
+        peerId,
+        {
+          conversationId: activeConversationId.value,
+          lastContent: preview,
+          lastTime: time,
+          unreadCount: 0,
+        },
+        { moveToTop: true },
+      );
+    }
+  }
+
+  async function selectGroup(item: GroupItem, options?: { forceRefreshMessages?: boolean }) {
+    const forceRefreshMessages = !!options?.forceRefreshMessages;
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】切换会话时重置新消息提示状态-----------
+    pendingNewMsgCount.value = 0;
+    isNearBottom.value = true;
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】切换会话时重置新消息提示状态-----------
+    if (activeGroup.value?.conversationId === item.conversationId && activeConversationId.value) {
+      activeGroup.value = { ...item, unreadCount: 0 };
+      applyActiveSessionReadState();
+      if (forceRefreshMessages || hasNewerMessagesThanCache(activeConversationId.value)) {
+        await loadMessages(true, { forceRefresh: true });
+      }
+      return;
+    }
+    activeChatType.value = 'group';
+    activeGroup.value = { ...item, unreadCount: 0 };
+    activeMember.value = null;
+    activeTargetUserId.value = '';
+    setImActiveTargetUserId('');
+    activeConversationId.value = item.conversationId;
+    setImActiveConversationId(item.conversationId);
+    patchGroup(item.conversationId, { unreadCount: 0 }, { moveToTop: false });
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】打开群聊时清零全局群聊未读缓存-----------
+    resetGroupUnread(item.conversationId);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】打开群聊时清零全局群聊未读缓存-----------
+    await loadMessages(true, { forceRefresh: forceRefreshMessages });
+  }
+
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】发起群聊弹窗需传 data 触发成员加载-----------
+  function handleOpenCreateGroupModal() {
+    // useModalInner 必须传入 data 才会触发打开回调，否则不会加载成员列表
+    openCreateGroupModal(true, {
+      members: deptMembers.value.filter((item) => item.id !== currentUserId.value),
+    });
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】发起群聊弹窗需传 data 触发成员加载-----------
+
+  async function handleGroupCreated(group: Recordable) {
+    await loadGroups(true);
+    const found = groupList.value.find((item) => item.conversationId === group.conversationId);
+    if (found) {
+      leftListTab.value = 'group';
+      await selectGroup(found, { forceRefreshMessages: true });
+    }
+  }
+
   /** 无感更新左侧列表项（不请求接口、不触发 loading） */
   function patchDeptMember(
     userId: string,
@@ -538,19 +924,31 @@
     deptMembers.value = list;
     patchCachedMember(userId, patch, options);
     syncImUnreadFromMembers(deptMembers.value);
-    if (activeTargetUserId.value === userId) {
+    syncAllUnread();
+    if (activeTargetUserId.value === userId || activeMember.value?.id === userId) {
+      if (!activeTargetUserId.value) {
+        activeTargetUserId.value = userId;
+        setImActiveTargetUserId(userId);
+      }
       activeMember.value = { ...(activeMember.value || updated), ...updated };
+      if (updated.conversationId && updated.conversationId !== activeConversationId.value) {
+        activeConversationId.value = updated.conversationId;
+        syncGlobalActiveSession();
+      }
     }
   }
 
   function syncActiveMember() {
-    if (!activeTargetUserId.value) {
+    const peerId = getActiveSingleChatPeerId();
+    if (!peerId) {
       return;
     }
-    const found = deptMembers.value.find((item) => item.id === activeTargetUserId.value);
+    const found = deptMembers.value.find((item) => item.id === peerId);
     if (found) {
       const normalized = { ...found, unreadCount: 0 };
       activeMember.value = normalized;
+      activeTargetUserId.value = peerId;
+      setImActiveTargetUserId(peerId);
       if (found.conversationId) {
         activeConversationId.value = found.conversationId;
         setImActiveConversationId(found.conversationId);
@@ -560,20 +958,35 @@
 
   /** 当前正在查看的会话：本地与角标均视为已读 */
   function applyActiveSessionReadState() {
-    if (!activeTargetUserId.value || !activeConversationId.value) {
+    if (!activeConversationId.value) {
       return;
     }
-    patchDeptMember(activeTargetUserId.value, { unreadCount: 0 }, { moveToTop: false });
+    syncGlobalActiveSession();
+    if (activeChatType.value === 'group' && activeGroup.value) {
+      patchGroup(activeGroup.value.conversationId, { unreadCount: 0 }, { moveToTop: false });
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】标记群聊已读时同步清零全局群聊未读缓存-----------
+      resetGroupUnread(activeGroup.value.conversationId);
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】标记群聊已读时同步清零全局群聊未读缓存-----------
+    } else if (activeTargetUserId.value) {
+      patchDeptMember(activeTargetUserId.value, { unreadCount: 0 }, { moveToTop: false });
+    }
     markRead(activeConversationId.value).catch(() => {});
   }
 
+  function getActiveSummaryLastTime() {
+    if (activeChatType.value === 'group') {
+      return activeGroup.value?.lastTime;
+    }
+    return activeMember.value?.lastTime;
+  }
+
   /** 是否还有更早的消息可加载 */
   function updateHasMore(latestBatch: MessageItem[]) {
     if (latestBatch.length >= pageSize) {
       hasMore.value = true;
       return;
     }
-    const lastTime = activeMember.value?.lastTime;
+    const lastTime = getActiveSummaryLastTime();
     if (!lastTime) {
       hasMore.value = false;
       return;
@@ -606,7 +1019,9 @@
         await nextTick();
         scrollToBottom();
         markRead(conversationId).catch(() => {});
-        if (activeTargetUserId.value) {
+        if (activeChatType.value === 'group' && activeGroup.value) {
+          patchGroup(activeGroup.value.conversationId, { unreadCount: 0 }, { moveToTop: false });
+        } else if (activeTargetUserId.value) {
           patchDeptMember(activeTargetUserId.value, { unreadCount: 0 }, { moveToTop: false });
         }
         if (!needFetch) {
@@ -637,16 +1052,19 @@
       const records: MessageItem[] = page?.records || [];
       if (reset) {
         if (records.length > 0 || !displayedFromCache) {
-          messageList.value = records;
-          setCachedMessages(conversationId, records, records.length >= pageSize, {
-            allowEmpty: records.length === 0,
+          const merged = mergeMessageLists(messageList.value, records);
+          messageList.value = merged;
+          setCachedMessages(conversationId, merged, merged.length >= pageSize, {
+            allowEmpty: merged.length === 0,
           });
         }
         updateHasMore(records.length > 0 ? records : messageList.value);
         await nextTick();
         scrollToBottom();
         markRead(conversationId).catch(() => {});
-        if (activeTargetUserId.value) {
+        if (activeChatType.value === 'group' && activeGroup.value) {
+          patchGroup(activeGroup.value.conversationId, { unreadCount: 0 }, { moveToTop: false });
+        } else if (activeTargetUserId.value) {
           patchDeptMember(activeTargetUserId.value, { unreadCount: 0 }, { moveToTop: false });
         }
       } else if (records.length > 0) {
@@ -679,7 +1097,17 @@
 
   async function handleMessageBoxScroll() {
     const box = messageBoxRef.value;
-    if (!box || msgLoading.value || !hasMore.value || scrollLoading) {
+    if (!box) {
+      return;
+    }
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】实时检测是否靠近底部，靠近时清除新消息提示-----------
+    const nearBottom = box.scrollHeight - box.scrollTop - box.clientHeight < 120;
+    isNearBottom.value = nearBottom;
+    if (nearBottom && pendingNewMsgCount.value > 0) {
+      pendingNewMsgCount.value = 0;
+    }
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】实时检测是否靠近底部，靠近时清除新消息提示-----------
+    if (msgLoading.value || !hasMore.value || scrollLoading) {
       return;
     }
     if (box.scrollTop > 80) {
@@ -695,6 +1123,10 @@
 
   async function selectMember(item: DeptMemberItem, options?: { forceRefreshMessages?: boolean }) {
     const forceRefreshMessages = !!options?.forceRefreshMessages;
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】切换会话时重置新消息提示状态-----------
+    pendingNewMsgCount.value = 0;
+    isNearBottom.value = true;
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】切换会话时重置新消息提示状态-----------
     if (activeTargetUserId.value === item.id && activeConversationId.value) {
       activeMember.value = { ...item, unreadCount: 0 };
       applyActiveSessionReadState();
@@ -706,6 +1138,8 @@
     activeTargetUserId.value = item.id;
     setImActiveTargetUserId(item.id);
     activeMember.value = { ...item, unreadCount: 0 };
+    activeGroup.value = null;
+    activeChatType.value = 'single';
 
     if (item.conversationId) {
       activeConversationId.value = item.conversationId;
@@ -737,6 +1171,10 @@
     const el = messageBoxRef.value;
     if (el) {
       el.scrollTop = el.scrollHeight;
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】滚动到底部时清除新消息提示-----------
+      isNearBottom.value = true;
+      pendingNewMsgCount.value = 0;
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】滚动到底部时清除新消息提示-----------
     }
   }
 
@@ -755,12 +1193,7 @@
       appendCachedMessage(activeConversationId.value, msg);
       await nextTick();
       scrollToBottom();
-      patchDeptMember(activeTargetUserId.value, {
-        conversationId: activeConversationId.value,
-        lastContent: formatImMessagePreview(msg.content, msg.msgType),
-        lastTime: msg.createTime,
-        unreadCount: 0,
-      });
+      patchActiveConversationSummary(formatImMessagePreview(msg.content, msg.msgType), msg.createTime);
     } finally {
       sending.value = false;
     }
@@ -822,12 +1255,7 @@
       appendCachedMessage(activeConversationId.value, msg);
       await nextTick();
       scrollToBottom();
-      patchDeptMember(activeTargetUserId.value, {
-        conversationId: activeConversationId.value,
-        lastContent: formatImMessagePreview(msg.content, msg.msgType),
-        lastTime: msg.createTime,
-        unreadCount: 0,
-      });
+      patchActiveConversationSummary(formatImMessagePreview(msg.content, msg.msgType), msg.createTime);
     } finally {
       sending.value = false;
     }
@@ -844,63 +1272,104 @@
       appendCachedMessage(activeConversationId.value, msg);
       await nextTick();
       scrollToBottom();
-      patchDeptMember(activeTargetUserId.value, {
-        conversationId: activeConversationId.value,
-        lastContent: formatImMessagePreview(msg.content, msg.msgType),
-        lastTime: msg.createTime,
-        unreadCount: 0,
-      });
+      patchActiveConversationSummary(formatImMessagePreview(msg.content, msg.msgType), msg.createTime);
     } finally {
       sending.value = false;
     }
   }
   //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】点击功能名气泡选择列表明细发送-----------
 
-  function onChatSocket(data: Record<string, any>) {
+  function appendIncomingMessage(data: Record<string, any>) {
+    const conversationId = data.conversationId as string;
+    const senderId = data.senderId as string;
+    if (messageList.value.some((item) => item.id === data.messageId)) {
+      patchActiveConversationSummary(formatImMessagePreview(data.content, data.msgType), data.createTime);
+      return;
+    }
+    const msg: MessageItem = {
+      id: data.messageId,
+      conversationId,
+      senderId,
+      senderName: data.senderName,
+      senderAvatar: data.senderAvatar,
+      content: data.content,
+      msgType: data.msgType,
+      mine: senderId === currentUserId.value,
+      createTime: data.createTime,
+    };
+    messageList.value.push(msg);
+    appendCachedMessage(conversationId, msg);
+    patchActiveConversationSummary(formatImMessagePreview(data.content, data.msgType), data.createTime);
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】收到新消息时：靠近底部则自动滚底，否则显示新消息提示-----------
+    nextTick(() => {
+      if (isNearBottom.value) {
+        scrollToBottom();
+      } else {
+        pendingNewMsgCount.value++;
+      }
+    });
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】收到新消息时：靠近底部则自动滚底，否则显示新消息提示-----------
+  }
+
+  function handleImChatSocketUi(data: Record<string, any>) {
     if (data.cmd !== 'chat') {
       return;
     }
+    if (!shouldRenderIncomingOnThisInstance()) {
+      return;
+    }
     const conversationId = data.conversationId as string;
     const senderId = data.senderId as string;
-    //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】仅前台实例处理当前会话 WS 消息-----------
-    const isActiveConversation = isThisInstanceActive() && !!conversationId && conversationId === activeConversationId.value;
-    //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】仅前台实例处理当前会话 WS 消息-----------
+    const preview = formatImMessagePreview(data.content, data.msgType);
+    const isGroupMessage = data.convType === 'group';
+    const matchedGroup = groupList.value.find((item) => item.conversationId === conversationId);
+    const isCurrentConversation = resolveIsCurrentConversation(conversationId, senderId, isGroupMessage || !!matchedGroup);
 
-    if (isActiveConversation) {
-      const exists = messageList.value.some((item) => item.id === data.messageId);
-      if (!exists) {
-        messageList.value.push({
-          id: data.messageId,
-          conversationId,
-          senderId,
-          senderName: data.senderName,
-          senderAvatar: data.senderAvatar,
-          content: data.content,
-          msgType: data.msgType,
-          mine: senderId === currentUserId.value,
-          createTime: data.createTime,
-        });
-        appendCachedMessage(conversationId, messageList.value[messageList.value.length - 1]);
-        nextTick(() => scrollToBottom());
-      }
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】当前会话 WS 消息即时渲染，避免只更新侧栏摘要-----------
+    if (isCurrentConversation) {
+      alignActiveConversationId(conversationId);
+      appendIncomingMessage(data);
       markRead(conversationId);
-      if (activeTargetUserId.value) {
-        patchDeptMember(activeTargetUserId.value, {
-          conversationId,
-          lastContent: formatImMessagePreview(data.content, data.msgType),
-          lastTime: data.createTime,
-          unreadCount: 0,
+      return;
+    }
+    //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】当前会话 WS 消息即时渲染，避免只更新侧栏摘要-----------
+
+    if (isGroupMessage || matchedGroup) {
+      if (!matchedGroup) {
+        //update-begin---author:xsl ---date:20260528 for：【IM聊天】群聊不在列表时，loadGroups 后不再手动 +1（API 已含正确未读数，再 +1 会导致角标翻倍）-----------
+        loadGroups(true).then(() => {
+          patchGroup(conversationId, {
+            lastContent: preview,
+            lastTime: data.createTime,
+          });
         });
+        //update-end---author:xsl ---date:20260528 for：【IM聊天】群聊不在列表时，loadGroups 后不再手动 +1（API 已含正确未读数，再 +1 会导致角标翻倍）-----------
+        return;
       }
+      patchGroup(
+        conversationId,
+        {
+          lastContent: preview,
+          lastTime: data.createTime,
+        },
+        { unreadIncrement: 1 },
+      );
       return;
     }
 
-    // 非当前会话：仅本地更新摘要与未读，不整表刷新
+    // 非当前会话：单聊按发送人更新摘要与未读
+    const viewingPeer = isViewingSingleChatPeer(senderId);
+    if (viewingPeer) {
+      alignActiveConversationId(conversationId);
+      appendIncomingMessage(data);
+      markRead(conversationId);
+      return;
+    }
     patchDeptMember(
       senderId,
       {
         conversationId,
-        lastContent: formatImMessagePreview(data.content, data.msgType),
+        lastContent: preview,
         lastTime: data.createTime,
       },
       { unreadIncrement: 1 },
@@ -910,17 +1379,51 @@
   onMounted(() => {
     loadLeftPanelPreference();
     ensureWebSocketConnected();
-    onWebSocket(onChatSocket);
+    unsubscribeChatSocketUi = onImChatSocketUi(handleImChatSocketUi);
     loadDeptMembers();
     prefetchImChatData();
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】WS 重连 + 页签重新可见时刷新当前会话消息-----------
+    unsubscribeWsReconnect = onWebSocketReconnect(() => {
+      if (!isForegroundImInstance() || !activeConversationId.value) {
+        return;
+      }
+      loadMessages(true, { forceRefresh: true });
+    });
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】WS 重连 + 页签重新可见时刷新当前会话消息-----------
     //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗与全页双实例共享缓存同步消息-----------
     unsubscribeMessagesUpdated = onImMessagesUpdated((conversationId) => {
-      if (conversationId && conversationId === activeConversationId.value) {
-        syncMessagesFromCache();
+      if (!conversationId || !isForegroundImInstance()) {
+        return;
       }
+      if (!shouldSyncConversationCache(conversationId)) {
+        return;
+      }
+      if (conversationId !== activeConversationId.value) {
+        alignActiveConversationId(conversationId);
+      }
+      syncMessagesFromCache();
+      syncConversationSidebarFromCache(conversationId);
     });
-    if (!props.embedded) {
+    if (props.embedded) {
+      unsubscribeChatWindowOpen = onImChatWindowOpenChange((open) => {
+        if (open) {
+          restoreSessionIfNeeded();
+          applyActiveSessionReadState();
+          //update-begin---author:xsl ---date:20260528 for：【IM聊天】弹窗打开时后台预载群列表，确保群聊 tab 角标立即可见-----------
+          if (reactiveGroupUnreadCount.value > 0 && !groupList.value.length && !groupLoading.value) {
+            loadGroups();
+          }
+          //update-end---author:xsl ---date:20260528 for：【IM聊天】弹窗打开时后台预载群列表，确保群聊 tab 角标立即可见-----------
+        }
+      });
+    } else {
       setImChatPageActive(true);
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】全页 IM 激活时后台预载群列表-----------
+      if (reactiveGroupUnreadCount.value > 0 && !groupList.value.length && !groupLoading.value) {
+        loadGroups();
+      }
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】全页 IM 激活时后台预载群列表-----------
       unsubscribeChatWindowOpen = onImChatWindowOpenChange((open) => {
         if (!open) {
           restoreConversationView();
@@ -930,6 +1433,9 @@
       //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】通知/消息列表统一在全页 IM 打开会话-----------
       unsubscribeOpenTarget = onImOpenTargetRequest((targetUserId) => openTargetChat(targetUserId));
       //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】通知/消息列表统一在全页 IM 打开会话-----------
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】全页 IM 接收群聊导航请求-----------
+      unsubscribeOpenGroup = onImOpenGroupRequest((conversationId) => openGroupConversation(conversationId));
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】全页 IM 接收群聊导航请求-----------
     }
     //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗与全页双实例共享缓存同步消息-----------
   });
@@ -952,6 +1458,7 @@
     if (!activeConversationId.value) {
       return;
     }
+    syncGlobalActiveSession();
     if (hasNewerMessagesThanCache(activeConversationId.value)) {
       loadMessages(true, { forceRefresh: true });
       return;
@@ -971,11 +1478,52 @@
     loadMessages(true);
   }
 
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】预设活跃对端，防止 WS 消息在异步初始化期间丢失-----------
+  /**
+   * 立即预设活跃单聊对端（由弹窗在 nextTick 调用，或 openTargetChat 内部调用）
+   *
+   * 切换到不同对端时同步清空 activeConversationId，确保 selectMember 走全量初始化分支
+   * 而不误用旧会话 ID 加载上次对话内容。
+   */
+  function presetActivePeer(userId: string) {
+    if (!userId) {
+      return;
+    }
+    const changingPeer = activeTargetUserId.value !== userId;
+    activeTargetUserId.value = userId;
+    setImActiveTargetUserId(userId);
+    activeChatType.value = 'single';
+    activeGroup.value = null;
+    if (changingPeer) {
+      // 切换对端：清空旧会话 ID，防止 selectMember 误判为"已激活旧会话"进入错误分支
+      activeConversationId.value = '';
+      setImActiveConversationId('');
+      activeMember.value = null;
+    }
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】预设活跃对端，防止 WS 消息在异步初始化期间丢失-----------
+
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】页签重新可见时检测是否有新消息并刷新-----------
+  function handleVisibilityChange() {
+    if (document.hidden || !isForegroundImInstance() || !activeConversationId.value) {
+      return;
+    }
+    if (hasNewerMessagesThanCache(activeConversationId.value)) {
+      loadMessages(true, { forceRefresh: true });
+    }
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】页签重新可见时检测是否有新消息并刷新-----------
+
   /** 从外部打开指定同事的会话（消息提醒等场景） */
   async function openTargetChat(userId: string) {
     if (!userId) {
       return;
     }
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】在异步操作前立即预设活跃对端，避免 WS 消息丢失-----------
+    if (activeTargetUserId.value !== userId) {
+      presetActivePeer(userId);
+    }
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】在异步操作前立即预设活跃对端，避免 WS 消息丢失-----------
     if (!deptMembers.value.length) {
       await loadDeptMembers(false, true);
     }
@@ -989,10 +1537,33 @@
     }
   }
 
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】从消息提醒直接打开群聊会话-----------
+  /** 外部直接打开指定群聊（消息提醒等场景） */
+  async function openGroupConversation(conversationId: string) {
+    if (!conversationId) {
+      return;
+    }
+    leftListTab.value = 'group';
+    if (!groupList.value.length) {
+      await loadGroups();
+    }
+    const found = groupList.value.find((item) => item.conversationId === conversationId);
+    if (found) {
+      await selectGroup(found, { forceRefreshMessages: true });
+    }
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】从消息提醒直接打开群聊会话-----------
+
   //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗关闭仅暂停会话标记-----------
-  /** 弹窗关闭时仅清除全局「正在查看」标记，保留本地消息列表 */
+  /**
+   * 弹窗关闭时仅清除全局「正在查看」标记，保留本地消息列表（快速恢复）。
+   * 同步清空本地 activeConversationId，防止弹窗再次打开时误用旧会话 ID。
+   */
   function pauseActiveSession() {
     clearImActiveSession();
+    // 清空本地会话 ID，确保再次打开时 presetActivePeer 能正确判断是否换了对端
+    activeConversationId.value = '';
+    setImActiveConversationId('');
   }
   //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗关闭仅暂停会话标记-----------
 
@@ -1001,19 +1572,30 @@
     activeTargetUserId.value = '';
     activeConversationId.value = '';
     activeMember.value = null;
+    activeGroup.value = null;
+    activeChatType.value = '';
     messageList.value = [];
     draft.value = '';
     clearImActiveSession();
-    syncImUnreadFromMembers(deptMembers.value);
+    syncAllUnread();
   }
 
-  defineExpose({ restoreSessionIfNeeded, openTargetChat, clearActiveSession, pauseActiveSession });
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】暴露 presetActivePeer / openGroupConversation 供弹窗调用-----------
+  defineExpose({ restoreSessionIfNeeded, openTargetChat, openGroupConversation, clearActiveSession, pauseActiveSession, presetActivePeer });
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】暴露 presetActivePeer / openGroupConversation 供弹窗调用-----------
 
   onUnmounted(() => {
-    offWebSocket(onChatSocket);
+    unsubscribeChatSocketUi?.();
     unsubscribeMessagesUpdated?.();
     unsubscribeChatWindowOpen?.();
     unsubscribeOpenTarget?.();
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】清理群聊导航监听-----------
+    unsubscribeOpenGroup?.();
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】清理群聊导航监听-----------
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】WS 重连 + 页签重新可见时刷新当前会话消息-----------
+    unsubscribeWsReconnect?.();
+    document.removeEventListener('visibilitychange', handleVisibilityChange);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】WS 重连 + 页签重新可见时刷新当前会话消息-----------
     if (!props.embedded) {
       setImChatPageActive(false);
     }
@@ -1167,6 +1749,54 @@
     }
   }
 
+  .im-left-tabs {
+    display: flex;
+    gap: 8px;
+    padding: 0 12px 8px;
+  }
+
+  .im-left-tab {
+    flex: 1;
+    height: 30px;
+    border: 1px solid #f0f0f0;
+    border-radius: 6px;
+    background: #fafafa;
+    color: #595959;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 4px;
+
+    &.active {
+      color: #1677ff;
+      border-color: #91caff;
+      background: #e6f4ff;
+    }
+  }
+
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】tab 未读角标样式-----------
+  .tab-unread-badge {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 16px;
+    height: 16px;
+    padding: 0 4px;
+    font-size: 11px;
+    line-height: 16px;
+    font-weight: 500;
+    background: #ff4d4f;
+    color: #fff;
+    border-radius: 8px;
+    white-space: nowrap;
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】tab 未读角标样式-----------
+
+  .im-group-actions {
+    padding: 0 12px 8px;
+  }
+
   .im-search-wrap {
     padding: 8px 10px 0;
     box-sizing: border-box;
@@ -1288,6 +1918,15 @@
     }
   }
 
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】新消息提示容器与按钮样式-----------
+  .message-box-wrap {
+    flex: 1;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+  }
+
   .message-box {
     flex: 1;
     overflow-y: auto;
@@ -1295,6 +1934,43 @@
     background: #fafafa;
   }
 
+  .new-msg-tip {
+    position: absolute;
+    bottom: 14px;
+    left: 50%;
+    transform: translateX(-50%);
+    white-space: nowrap;
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    padding: 6px 16px;
+    background: rgba(22, 119, 255, 0.88);
+    color: #fff;
+    font-size: 13px;
+    border-radius: 999px;
+    cursor: pointer;
+    box-shadow: 0 3px 10px rgba(22, 119, 255, 0.3);
+    z-index: 10;
+    user-select: none;
+    transition: background 0.15s;
+
+    &:hover {
+      background: rgba(22, 119, 255, 1);
+    }
+  }
+
+  .new-msg-tip-fade-enter-active,
+  .new-msg-tip-fade-leave-active {
+    transition: opacity 0.2s, transform 0.2s;
+  }
+
+  .new-msg-tip-fade-enter-from,
+  .new-msg-tip-fade-leave-to {
+    opacity: 0;
+    transform: translateX(-50%) translateY(8px);
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】新消息提示容器与按钮样式-----------
+
   .load-more,
   .load-more-hint {
     text-align: center;
diff --git a/jeecgboot-vue3/src/views/system/im/ImChatModal.vue b/jeecgboot-vue3/src/views/system/im/ImChatModal.vue
index df0ac71..44c213c 100644
--- a/jeecgboot-vue3/src/views/system/im/ImChatModal.vue
+++ b/jeecgboot-vue3/src/views/system/im/ImChatModal.vue
@@ -20,7 +20,7 @@
   import { ref, nextTick, onMounted, onUnmounted } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import ImChat from './ImChat.vue';
-  import { setImChatWindowOpen } from './imCache';
+  import { setImChatWindowOpen, setImActiveTargetUserId } from './imCache';
   import { canOpenImChatModal, onImChatModalCloseRequest, openImChat, setImPageContext } from './imSession';
   import { refreshImUnread } from './useImUnread';
 
@@ -28,29 +28,53 @@
 
   const imChatRef = ref<InstanceType<typeof ImChat>>();
   const pendingTargetUserId = ref('');
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
+  const pendingConversationId = ref('');
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
 
   function restoreChatSession() {
     nextTick(async () => {
       const targetUserId = pendingTargetUserId.value;
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
+      const conversationId = pendingConversationId.value;
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
       if (targetUserId) {
         pendingTargetUserId.value = '';
+        //update-begin---author:xsl ---date:20260528 for：【IM聊天】预设本地活跃会话，防止 WS 消息在异步初始化期间丢失-----------
+        imChatRef.value?.presetActivePeer?.(targetUserId);
+        //update-end---author:xsl ---date:20260528 for：【IM聊天】预设本地活跃会话，防止 WS 消息在异步初始化期间丢失-----------
         await imChatRef.value?.openTargetChat?.(targetUserId);
         return;
       }
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
+      if (conversationId) {
+        pendingConversationId.value = '';
+        await imChatRef.value?.openGroupConversation?.(conversationId);
+        return;
+      }
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
       imChatRef.value?.restoreSessionIfNeeded?.();
     });
   }
 
-  const [registerModal, { closeModal }] = useModalInner((data?: { targetUserId?: string }) => {
+  const [registerModal, { closeModal }] = useModalInner((data?: { targetUserId?: string; conversationId?: string }) => {
     //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】全页 IM 已打开时拒绝弹窗，改由全页承接-----------
     if (!canOpenImChatModal()) {
       closeModal();
-      openImChat({ targetUserId: data?.targetUserId });
+      openImChat({ targetUserId: data?.targetUserId, conversationId: data?.conversationId });
       return;
     }
     //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】全页 IM 已打开时拒绝弹窗，改由全页承接-----------
     setImChatWindowOpen(true);
     pendingTargetUserId.value = data?.targetUserId || '';
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
+    pendingConversationId.value = data?.conversationId || '';
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】弹窗打开立即预热全局活跃 userId，避免 WS 消息在 nextTick 前丢失-----------
+    if (data?.targetUserId) {
+      setImActiveTargetUserId(data.targetUserId);
+    }
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】弹窗打开立即预热全局活跃 userId，避免 WS 消息在 nextTick 前丢失-----------
     restoreChatSession();
   });
 
diff --git a/jeecgboot-vue3/src/views/system/im/ImCreateGroupModal.vue b/jeecgboot-vue3/src/views/system/im/ImCreateGroupModal.vue
new file mode 100644
index 0000000..940e20f
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/im/ImCreateGroupModal.vue
@@ -0,0 +1,161 @@
+<template>
+  <BasicModal v-bind="$attrs" title="发起群聊" :width="520" @register="registerModal" @ok="handleSubmit">
+    <a-form layout="vertical">
+      <a-form-item label="群名称" required>
+        <a-input v-model:value="groupName" placeholder="请输入群名称" :maxlength="30" show-count />
+      </a-form-item>
+      <a-form-item label="选择成员" required>
+        <a-input
+          v-model:value="memberKeyword"
+          placeholder="搜索同事"
+          allow-clear
+          size="small"
+          class="member-search"
+          @pressEnter="loadMembers"
+        />
+        <a-spin :spinning="loading">
+          <div class="member-list">
+            <a-checkbox-group v-model:value="checkedMemberIds" class="member-checkbox-group">
+              <div v-for="item in filteredMembers" :key="item.id" class="member-row">
+                <a-checkbox :value="item.id">
+                  <div class="member-info">
+                    <a-avatar :size="28" :src="getAvatarUrl(item.avatar)">
+                      {{ (item.realname || item.username || '?').slice(0, 1) }}
+                    </a-avatar>
+                    <span class="member-name">{{ item.realname || item.username }}</span>
+                  </div>
+                </a-checkbox>
+              </div>
+            </a-checkbox-group>
+            <a-empty v-if="!filteredMembers.length" description="暂无可选同事" />
+          </div>
+        </a-spin>
+      </a-form-item>
+    </a-form>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  import { createGroupConversation, fetchDeptMembers } from './im.api';
+  import { getCachedMembers } from './imCache';
+
+  defineOptions({ name: 'ImCreateGroupModal' });
+
+  const userStore = useUserStore();
+
+  const emit = defineEmits<{
+    success: [group: Recordable];
+  }>();
+
+  const { createMessage } = useMessage();
+  const groupName = ref('');
+  const memberKeyword = ref('');
+  const checkedMemberIds = ref<string[]>([]);
+  const members = ref<Recordable[]>([]);
+  const loading = ref(false);
+
+  const filteredMembers = computed(() => {
+    const keyword = memberKeyword.value.trim().toLowerCase();
+    if (!keyword) {
+      return members.value;
+    }
+    return members.value.filter((item) => {
+      const name = `${item.realname || ''}${item.username || ''}`.toLowerCase();
+      return name.includes(keyword);
+    });
+  });
+
+  function resolveSelectableMembers(source?: Recordable[]) {
+    const currentUserId = userStore.getUserInfo?.id || '';
+    const list = source?.length ? source : getCachedMembers() || [];
+    return list.filter((item) => item.id && item.id !== currentUserId);
+  }
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data?: { members?: Recordable[] }) => {
+    groupName.value = '';
+    memberKeyword.value = '';
+    checkedMemberIds.value = [];
+    setModalProps({ confirmLoading: false });
+    members.value = resolveSelectableMembers(data?.members);
+    await loadMembers();
+  });
+
+  function getAvatarUrl(avatar?: string) {
+    return avatar ? getFileAccessHttpUrl(avatar) : '';
+  }
+
+  async function loadMembers() {
+    loading.value = true;
+    try {
+      const list = ((await fetchDeptMembers(memberKeyword.value || undefined)) || []) as Recordable[];
+      members.value = resolveSelectableMembers(list);
+    } catch {
+      createMessage.error('加载同事列表失败，请稍后重试');
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  async function handleSubmit() {
+    const name = groupName.value.trim();
+    if (!name) {
+      createMessage.warning('请输入群名称');
+      return;
+    }
+    if (!checkedMemberIds.value.length) {
+      createMessage.warning('请至少选择1名同事');
+      return;
+    }
+    setModalProps({ confirmLoading: true });
+    try {
+      const group = await createGroupConversation({
+        groupName: name,
+        memberUserIds: checkedMemberIds.value,
+      });
+      emit('success', group);
+      closeModal();
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .member-search {
+    margin-bottom: 8px;
+  }
+
+  .member-list {
+    max-height: 320px;
+    overflow-y: auto;
+    border: 1px solid #f0f0f0;
+    border-radius: 6px;
+    padding: 8px;
+  }
+
+  .member-checkbox-group {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    width: 100%;
+  }
+
+  .member-row {
+    padding: 4px 0;
+  }
+
+  .member-info {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .member-name {
+    font-size: 13px;
+  }
+</style>
diff --git a/jeecgboot-vue3/src/views/system/im/im.api.ts b/jeecgboot-vue3/src/views/system/im/im.api.ts
index 5362627..d41b423 100644
--- a/jeecgboot-vue3/src/views/system/im/im.api.ts
+++ b/jeecgboot-vue3/src/views/system/im/im.api.ts
@@ -6,6 +6,19 @@ enum Api {
   messages = '/sys/im/chat/messages',
   send = '/sys/im/chat/send',
   read = '/sys/im/chat/read',
+  groups = '/sys/im/chat/groups',
+  groupCreate = '/sys/im/chat/group/create',
+}
+
+export interface ImGroupConversation {
+  conversationId: string;
+  convType?: string;
+  groupName?: string;
+  memberCount?: number;
+  ownerId?: string;
+  lastContent?: string;
+  lastTime?: string;
+  unreadCount?: number;
 }
 
 export const fetchDeptMembers = (keyword?: string) => defHttp.get({ url: Api.deptMembers, params: { keyword } });
@@ -39,3 +52,8 @@ export const sendMessage = (data: { conversationId: string; content: string; msg
 
 export const markRead = (conversationId: string) =>
   defHttp.put({ url: Api.read, params: { conversationId } }, { joinParamsToUrl: true, successMessageMode: 'none' });
+
+export const fetchGroups = () => defHttp.get<ImGroupConversation[]>({ url: Api.groups });
+
+export const createGroupConversation = (data: { groupName: string; memberUserIds: string[] }) =>
+  defHttp.post<ImGroupConversation>({ url: Api.groupCreate, data });
diff --git a/jeecgboot-vue3/src/views/system/im/imCache.ts b/jeecgboot-vue3/src/views/system/im/imCache.ts
index a975b61..7c13f61 100644
--- a/jeecgboot-vue3/src/views/system/im/imCache.ts
+++ b/jeecgboot-vue3/src/views/system/im/imCache.ts
@@ -1,7 +1,8 @@
 import dayjs from 'dayjs';
+import { ref as vueRef } from 'vue';
 import { createSessionStorage } from '/@/utils/cache';
 import { useUserStoreWithOut } from '/@/store/modules/user';
-import { fetchDeptMembers, fetchMessages } from './im.api';
+import { fetchDeptMembers, fetchMessages, fetchGroups } from './im.api';
 import { getImDefaultStartTime } from './imSettings';
 import { formatImMessagePreview } from './imMessageUtil';
 import { syncImUnreadFromMembers } from './useImUnread';
@@ -67,6 +68,25 @@ export function onImMessagesUpdated(listener: ImMessagesUpdatedListener) {
   return () => messageUpdatedListeners.delete(listener);
 }
 
+type ImChatSocketUiListener = (data: Record<string, any>) => void;
+const chatSocketUiListeners = new Set<ImChatSocketUiListener>();
+
+/** IM 聊天 UI 层 WS 分发（避免多 ImChat 实例重复绑定 onWebSocket） */
+export function onImChatSocketUi(listener: ImChatSocketUiListener) {
+  chatSocketUiListeners.add(listener);
+  return () => chatSocketUiListeners.delete(listener);
+}
+
+function dispatchImChatSocketUi(data: Record<string, any>) {
+  chatSocketUiListeners.forEach((listener) => {
+    try {
+      listener(data);
+    } catch (err) {
+      console.error(err);
+    }
+  });
+}
+
 type ImChatWindowOpenListener = (open: boolean) => void;
 const chatWindowOpenListeners = new Set<ImChatWindowOpenListener>();
 
@@ -187,11 +207,83 @@ export function clearImCache() {
   activeConversationId = '';
   activeTargetUserId = '';
   imChatWindowOpen = false;
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】清理群聊未读缓存-----------
+  groupUnreadCache.clear();
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】清理群聊未读缓存-----------
   if (scope) {
     sessionCache.remove(`${CACHE_KEY}:${scope}`);
   }
 }
 
+//update-begin---author:xsl ---date:20260528 for：【IM聊天】群聊未读缓存，独立于成员缓存，支持 WS 实时累加和角标统计-----------
+interface ImGroupUnreadEntry {
+  unreadCount: number;
+  lastContent?: string;
+  lastTime?: string;
+}
+
+/** key = conversationId */
+const groupUnreadCache = new Map<string, ImGroupUnreadEntry>();
+
+//update-begin---author:xsl ---date:20260528 for：【IM聊天】响应式群聊未读总数，供 ImChat.vue tab 角标实时更新-----------
+/** 响应式群聊未读总数（跨组件共享，无需加载群列表即可显示 tab 角标） */
+export const reactiveGroupUnreadCount = vueRef(0);
+
+function recalcGroupUnreadCount() {
+  let total = 0;
+  for (const entry of groupUnreadCache.values()) {
+    total += entry.unreadCount;
+  }
+  reactiveGroupUnreadCount.value = total;
+}
+//update-end---author:xsl ---date:20260528 for：【IM聊天】响应式群聊未读总数，供 ImChat.vue tab 角标实时更新-----------
+
+/** 从接口列表初始化群聊未读缓存（登录预取或 loadGroups 后调用） */
+export function initGroupUnreadFromList(
+  groups: Array<{ conversationId: string; unreadCount?: number; lastContent?: string; lastTime?: string }>,
+) {
+  for (const group of groups || []) {
+    if (group.conversationId) {
+      groupUnreadCache.set(group.conversationId, {
+        unreadCount: group.unreadCount || 0,
+        lastContent: group.lastContent,
+        lastTime: group.lastTime,
+      });
+    }
+  }
+  recalcGroupUnreadCount();
+}
+
+/** WS 收到群消息时累加未读 */
+export function incrementGroupUnread(conversationId: string, lastContent: string, lastTime: string) {
+  const current = groupUnreadCache.get(conversationId) || { unreadCount: 0 };
+  groupUnreadCache.set(conversationId, {
+    unreadCount: current.unreadCount + 1,
+    lastContent,
+    lastTime,
+  });
+  recalcGroupUnreadCount();
+}
+
+/** 打开群聊会话时清零（已读） */
+export function resetGroupUnread(conversationId: string) {
+  const current = groupUnreadCache.get(conversationId);
+  if (current) {
+    groupUnreadCache.set(conversationId, { ...current, unreadCount: 0 });
+    recalcGroupUnreadCount();
+  }
+}
+
+/** 供 syncImUnreadFromMembers 和 refreshImUnread 合并到总未读统计 */
+export function getCachedGroupUnreadItems(): Array<{ id: string; conversationId: string; unreadCount: number }> {
+  return Array.from(groupUnreadCache.entries()).map(([id, data]) => ({
+    id,
+    conversationId: id,
+    unreadCount: data.unreadCount,
+  }));
+}
+//update-end---author:xsl ---date:20260528 for：【IM聊天】群聊未读缓存，独立于成员缓存，支持 WS 实时累加和角标统计-----------
+
 export function getCachedMembers(): ImMemberItem[] | null {
   const snap = ensureMemory();
   return snap.members.length ? snap.members : null;
@@ -323,6 +415,15 @@ export async function prefetchImChatData(force = false): Promise<void> {
       setCachedMembers(members);
       syncImUnreadFromMembers(members);
 
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】预取群聊未读数，使顶部角标包含群聊未读-----------
+      fetchGroups()
+        .then((groups: any[]) => {
+          initGroupUnreadFromList(groups || []);
+          syncImUnreadFromMembers([...members, ...getCachedGroupUnreadItems()]);
+        })
+        .catch(() => {});
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】预取群聊未读数，使顶部角标包含群聊未读-----------
+
       const candidates = members
         .filter((item) => item.conversationId && (item.unreadCount || item.lastTime))
         .sort((a, b) => dayjs(b.lastTime || 0).valueOf() - dayjs(a.lastTime || 0).valueOf())
@@ -342,14 +443,37 @@ export async function prefetchImChatData(force = false): Promise<void> {
 }
 
 /** 顶部角标：收到新消息时更新缓存未读数 */
+//update-begin---author:xsl ---date:20260528 for：【IM聊天】按 messageId 去重，防止多个 WS 监听者重复调用导致角标翻倍-----------
+const _processedMsgIds = new Set<string>();
+//update-end---author:xsl ---date:20260528 for：【IM聊天】按 messageId 去重，防止多个 WS 监听者重复调用导致角标翻倍-----------
 export function handleImChatSocket(data: Record<string, any>) {
   if (data.cmd !== 'chat') {
     return;
   }
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】同一消息去重处理，避免多监听器重复累加未读-----------
+  const msgId = data.messageId as string;
+  if (msgId) {
+    if (_processedMsgIds.has(msgId)) {
+      return;
+    }
+    _processedMsgIds.add(msgId);
+    // 5 秒后清理，防止 Set 无限增长
+    setTimeout(() => _processedMsgIds.delete(msgId), 5000);
+  }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】同一消息去重处理，避免多监听器重复累加未读-----------
   const conversationId = data.conversationId as string;
   const senderId = data.senderId as string;
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】单聊 WS 即时同步缓存并区分群聊-----------
+  const isGroupMessage = data.convType === 'group';
+  const isViewingSinglePeer = !!activeTargetUserId && activeTargetUserId === senderId;
   const isActiveConversation =
-    isImChatUiOpen() && !!conversationId && conversationId === activeConversationId;
+    isImChatUiOpen() &&
+    !!conversationId &&
+    (conversationId === activeConversationId || (!isGroupMessage && isViewingSinglePeer));
+
+  if (isActiveConversation && conversationId !== activeConversationId) {
+    activeConversationId = conversationId;
+  }
 
   if (isActiveConversation) {
     const userStore = useUserStoreWithOut();
@@ -365,21 +489,32 @@ export function handleImChatSocket(data: Record<string, any>) {
       mine: senderId === currentUserId,
       createTime: data.createTime,
     });
-    const members = getCachedMembers() || [];
-    const peerMember = members.find((item) => item.conversationId === conversationId);
-    const peerUserId = peerMember?.id || (senderId !== currentUserId ? senderId : activeTargetUserId);
-    if (peerUserId) {
-      patchCachedMember(
-        peerUserId,
-        {
-          conversationId,
-          lastContent: formatImMessagePreview(data.content, data.msgType),
-          lastTime: data.createTime,
-          unreadCount: 0,
-        },
-        { moveToTop: true },
-      );
+    if (isGroupMessage) {
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】活跃群聊消息到达时，合并群聊未读数到角标-----------
+      syncImUnreadFromMembers([...(getCachedMembers() || []), ...getCachedGroupUnreadItems()]);
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】活跃群聊消息到达时，合并群聊未读数到角标-----------
+    } else {
+      const members = getCachedMembers() || [];
+      const peerMember = members.find((item) => item.conversationId === conversationId);
+      const peerUserId = peerMember?.id || (senderId !== currentUserId ? senderId : activeTargetUserId);
+      if (peerUserId) {
+        patchCachedMember(
+          peerUserId,
+          {
+            conversationId,
+            lastContent: formatImMessagePreview(data.content, data.msgType),
+            lastTime: data.createTime,
+            unreadCount: 0,
+          },
+          { moveToTop: true },
+        );
+      }
     }
+  } else if (isGroupMessage) {
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】非活跃群聊收到 WS 消息：累加群聊未读并更新顶部角标-----------
+    incrementGroupUnread(conversationId, formatImMessagePreview(data.content, data.msgType), data.createTime as string);
+    syncImUnreadFromMembers([...(getCachedMembers() || []), ...getCachedGroupUnreadItems()]);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】非活跃群聊收到 WS 消息：累加群聊未读并更新顶部角标-----------
   } else {
     ensureCachedMember(senderId, {
       username: data.senderName as string,
@@ -398,6 +533,10 @@ export function handleImChatSocket(data: Record<string, any>) {
       },
       { unreadIncrement: 1 },
     );
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】单聊未读角标也合并群聊未读，保持角标一致性-----------
+    syncImUnreadFromMembers([...(getCachedMembers() || []), ...getCachedGroupUnreadItems()]);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】单聊未读角标也合并群聊未读，保持角标一致性-----------
   }
-  syncImUnreadFromMembers(getCachedMembers() || []);
+  dispatchImChatSocketUi(data);
+  //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】单聊 WS 即时同步缓存并区分群聊-----------
 }
diff --git a/jeecgboot-vue3/src/views/system/im/imSession.ts b/jeecgboot-vue3/src/views/system/im/imSession.ts
index 2ddbfb1..81110a3 100644
--- a/jeecgboot-vue3/src/views/system/im/imSession.ts
+++ b/jeecgboot-vue3/src/views/system/im/imSession.ts
@@ -28,6 +28,22 @@ export function useImPageContext() {
 type ImOpenTargetListener = (targetUserId: string) => void | Promise<void>;
 const openTargetListeners = new Set<ImOpenTargetListener>();
 
+//update-begin---author:xsl ---date:20260528 for：【IM聊天】从消息提醒直接打开群聊会话-----------
+type ImOpenGroupListener = (conversationId: string) => void | Promise<void>;
+const openGroupListeners = new Set<ImOpenGroupListener>();
+
+export function onImOpenGroupRequest(listener: ImOpenGroupListener) {
+  openGroupListeners.add(listener);
+  return () => openGroupListeners.delete(listener);
+}
+
+async function notifyOpenGroup(conversationId: string) {
+  for (const listener of openGroupListeners) {
+    await listener(conversationId);
+  }
+}
+//update-end---author:xsl ---date:20260528 for：【IM聊天】从消息提醒直接打开群聊会话-----------
+
 export function setImChatPageActive(active: boolean) {
   imChatPageActive.value = active;
 }
@@ -78,6 +94,10 @@ export function requestCloseImChatModal() {
  */
 export async function openImChat(options?: {
   targetUserId?: string;
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
+  /** 群聊会话 ID（与 targetUserId 二选一） */
+  conversationId?: string;
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】支持从消息提醒直接打开群聊-----------
   pageContext?: ImPageContext | null;
 }): Promise<'page' | 'modal'> {
   //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】弹窗打开时快照背后功能页名称-----------
@@ -88,6 +108,10 @@ export async function openImChat(options?: {
   if (isImChatPageActive()) {
     if (options?.targetUserId) {
       await notifyOpenTarget(options.targetUserId);
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】全页 IM 时直接导航到指定群聊-----------
+    } else if (options?.conversationId) {
+      await notifyOpenGroup(options.conversationId);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】全页 IM 时直接导航到指定群聊-----------
     }
     return 'page';
   }
diff --git a/jeecgboot-vue3/src/views/system/im/useImUnread.ts b/jeecgboot-vue3/src/views/system/im/useImUnread.ts
index e3e3415..a11e0bc 100644
--- a/jeecgboot-vue3/src/views/system/im/useImUnread.ts
+++ b/jeecgboot-vue3/src/views/system/im/useImUnread.ts
@@ -2,6 +2,7 @@ import { ref } from 'vue';
 import { fetchDeptMembers } from './im.api';
 import {
   getCachedMembers,
+  getCachedGroupUnreadItems,
   getImActiveConversationId,
   getImActiveTargetUserId,
   isImChatUiOpen,
@@ -62,7 +63,9 @@ export async function refreshImUnread(force = false) {
   if (!force) {
     const cached = getCachedMembers();
     if (cached && !isMembersCacheStale()) {
-      syncImUnreadFromMembers(cached);
+      //update-begin---author:xsl ---date:20260528 for：【IM聊天】从缓存刷新时也合并群聊未读-----------
+      syncImUnreadFromMembers([...cached, ...getCachedGroupUnreadItems()]);
+      //update-end---author:xsl ---date:20260528 for：【IM聊天】从缓存刷新时也合并群聊未读-----------
       return;
     }
   }
@@ -70,7 +73,9 @@ export async function refreshImUnread(force = false) {
   try {
     const members = ((await fetchDeptMembers()) || []) as Array<{ unreadCount?: number; conversationId?: string; id?: string }>;
     setCachedMembers(members);
-    syncImUnreadFromMembers(members);
+    //update-begin---author:xsl ---date:20260528 for：【IM聊天】接口刷新时也合并群聊未读-----------
+    syncImUnreadFromMembers([...members, ...getCachedGroupUnreadItems()]);
+    //update-end---author:xsl ---date:20260528 for：【IM聊天】接口刷新时也合并群聊未读-----------
   } finally {
     refreshing = false;
   }
diff --git a/jeecgboot-vue3/src/views/system/message/components/SysImChatMessageList.vue b/jeecgboot-vue3/src/views/system/message/components/SysImChatMessageList.vue
index 9d4fd3b..e47042b 100644
--- a/jeecgboot-vue3/src/views/system/message/components/SysImChatMessageList.vue
+++ b/jeecgboot-vue3/src/views/system/message/components/SysImChatMessageList.vue
@@ -9,7 +9,7 @@
           <a-list-item-meta>
             <template #title>
               <div class="im-chat-msg-title">
-                <span class="im-chat-msg-name">{{ item.realname || item.username }}</span>
+                <span class="im-chat-msg-name">{{ item.displayName }}</span>
                 <a-badge :count="item.unreadCount" :overflow-count="99" />
               </div>
             </template>
@@ -18,9 +18,14 @@
             </template>
             <template #avatar>
               <a-badge dot :offset="[-2, 2]">
-                <a-avatar :src="getAvatarUrl(item.avatar)">
-                  {{ (item.realname || item.username || '?').slice(0, 1) }}
+                <!--update-begin---author:xsl ---date:20260528 for：【IM聊天】群聊显示群图标，单聊显示头像------------->
+                <a-avatar v-if="item.type === 'group'" :style="{ backgroundColor: '#1677ff' }">
+                  <Icon icon="ant-design:team-outlined" />
                 </a-avatar>
+                <a-avatar v-else :src="getAvatarUrl(item.avatar)">
+                  {{ (item.displayName || '?').slice(0, 1) }}
+                </a-avatar>
+                <!--update-end---author:xsl ---date:20260528 for：【IM聊天】群聊显示群图标，单聊显示头像----------->
               </a-badge>
             </template>
           </a-list-item-meta>
@@ -37,11 +42,13 @@
   import dayjs from 'dayjs';
   import { useModal } from '/@/components/Modal';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-  import { fetchDeptMembers } from '/@/views/system/im/im.api';
+  import { fetchDeptMembers, fetchGroups } from '/@/views/system/im/im.api';
   import { formatImMessagePreview } from '/@/views/system/im/imMessageUtil';
   import { syncImUnreadFromMembers } from '/@/views/system/im/useImUnread';
+  import { getCachedGroupUnreadItems, initGroupUnreadFromList } from '/@/views/system/im/imCache';
   import ImChatModal from '/@/views/system/im/ImChatModal.vue';
   import { openImChat } from '/@/views/system/im/imSession';
+  import { Icon } from '/@/components/Icon';
 
   defineOptions({ name: 'SysImChatMessageList' });
 
@@ -49,26 +56,59 @@
     (e: 'closeModal'): void;
   }>();
 
-  interface ChatMemberItem {
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】统一单聊与群聊展示类型-----------
+  type ItemType = 'single' | 'group';
+
+  interface UnreadItem {
+    type: ItemType;
+    /** 单聊：userId；群聊：conversationId */
     id: string;
-    username: string;
-    realname?: string;
+    displayName: string;
     avatar?: string;
     conversationId?: string;
     lastContent?: string;
     lastTime?: string;
     unreadCount?: number;
   }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】统一单聊与群聊展示类型-----------
 
   const loading = ref(false);
-  const members = ref<ChatMemberItem[]>([]);
+  const members = ref<any[]>([]);
+  const groups = ref<any[]>([]);
   const [registerImChatModal, { openModal: openImChatModal }] = useModal();
 
-  const unreadList = computed(() =>
-    members.value
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】合并单聊和群聊未读列表-----------
+  const unreadList = computed<UnreadItem[]>(() => {
+    const singleItems: UnreadItem[] = members.value
       .filter((item) => (item.unreadCount || 0) > 0)
-      .sort((a, b) => dayjs(b.lastTime || 0).valueOf() - dayjs(a.lastTime || 0).valueOf()),
-  );
+      .map((item) => ({
+        type: 'single',
+        id: item.id,
+        displayName: item.realname || item.username || '',
+        avatar: item.avatar,
+        conversationId: item.conversationId,
+        lastContent: item.lastContent,
+        lastTime: item.lastTime,
+        unreadCount: item.unreadCount,
+      }));
+
+    const groupItems: UnreadItem[] = groups.value
+      .filter((item) => (item.unreadCount || 0) > 0)
+      .map((item) => ({
+        type: 'group',
+        id: item.conversationId,
+        displayName: item.groupName || '群聊',
+        conversationId: item.conversationId,
+        lastContent: item.lastContent,
+        lastTime: item.lastTime,
+        unreadCount: item.unreadCount,
+      }));
+
+    return [...singleItems, ...groupItems].sort(
+      (a, b) => dayjs(b.lastTime || 0).valueOf() - dayjs(a.lastTime || 0).valueOf(),
+    );
+  });
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】合并单聊和群聊未读列表-----------
 
   const locale = computed(() => ({
     emptyText: loading.value ? ' ' : '暂无未读聊天消息',
@@ -96,36 +136,52 @@
     return d.format('MM-DD HH:mm');
   }
 
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】同时拉取单聊成员和群聊列表，修复 syncImUnreadFromMembers 丢失群聊未读-----------
   async function reload(silent = false) {
-    //update-begin---author:cursor ---date:20250528 for：【IM聊天-OA】聊天消息列表静默刷新，避免 spin 遮罩闪烁-----------
-    const showLoading = !silent && members.value.length === 0;
+    const showLoading = !silent && members.value.length === 0 && groups.value.length === 0;
     if (showLoading) {
       loading.value = true;
     }
     try {
-      members.value = ((await fetchDeptMembers()) || []) as ChatMemberItem[];
-      syncImUnreadFromMembers(members.value);
+      const [fetchedMembers, fetchedGroups] = await Promise.all([
+        fetchDeptMembers().catch(() => []),
+        fetchGroups().catch(() => []),
+      ]);
+      members.value = (fetchedMembers || []) as any[];
+      groups.value = (fetchedGroups || []) as any[];
+      // 同步群聊未读到全局缓存
+      initGroupUnreadFromList(groups.value);
+      // 合并单聊 + 群聊未读数，防止 syncImUnreadFromMembers 只传成员数据导致群聊角标清零
+      syncImUnreadFromMembers([...members.value, ...getCachedGroupUnreadItems()]);
     } catch {
       if (!silent) {
         members.value = [];
+        groups.value = [];
       }
     } finally {
       if (showLoading) {
         loading.value = false;
       }
     }
-    //update-end---author:cursor ---date:20250528 for：【IM聊天-OA】聊天消息列表静默刷新，避免 spin 遮罩闪烁-----------
   }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】同时拉取单聊成员和群聊列表，修复 syncImUnreadFromMembers 丢失群聊未读-----------
 
-  async function handleOpenChat(item: ChatMemberItem) {
-    //update-begin---author:xsl ---date:20260528 for：【IM聊天-OA】统一 IM 打开入口，全页优先-----------
-    const mode = await openImChat({ targetUserId: item.id, pageContext: null });
-    if (mode === 'modal') {
-      openImChatModal(true, { targetUserId: item.id, pageContext: null });
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】点击群聊条目直接打开群聊会话-----------
+  async function handleOpenChat(item: UnreadItem) {
+    if (item.type === 'group') {
+      const mode = await openImChat({ conversationId: item.conversationId });
+      if (mode === 'modal') {
+        openImChatModal(true, { conversationId: item.conversationId });
+      }
+    } else {
+      const mode = await openImChat({ targetUserId: item.id, pageContext: null });
+      if (mode === 'modal') {
+        openImChatModal(true, { targetUserId: item.id, pageContext: null });
+      }
     }
-    //update-end---author:xsl ---date:20260528 for：【IM聊天-OA】统一 IM 打开入口，全页优先-----------
     emit('closeModal');
   }
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】点击群聊条目直接打开群聊会话-----------
 
   defineExpose({ reload });
 </script>
diff --git a/jeecgboot-vue3/src/views/system/message/components/SysMessageModal.vue b/jeecgboot-vue3/src/views/system/message/components/SysMessageModal.vue
index a494a02..e002cd2 100644
--- a/jeecgboot-vue3/src/views/system/message/components/SysMessageModal.vue
+++ b/jeecgboot-vue3/src/views/system/message/components/SysMessageModal.vue
@@ -154,7 +154,9 @@
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   import { useImUnread } from '/@/views/system/im/useImUnread';
   import { onWebSocket, offWebSocket, ensureWebSocketConnected } from '/@/hooks/web/useWebSocket';
-  import { handleImChatSocket, isImChatUiOpen } from '/@/views/system/im/imCache';
+  //update-begin---author:xsl ---date:20260528 for：【IM聊天】只保留 isImChatUiOpen，handleImChatSocket 已移除（由 notify 统一调用）-----------
+  import { isImChatUiOpen } from '/@/views/system/im/imCache';
+  //update-end---author:xsl ---date:20260528 for：【IM聊天】只保留 isImChatUiOpen，handleImChatSocket 已移除（由 notify 统一调用）-----------
   import calendar from '/@/assets/icons/calendarNotice.png';
   import folder from '/@/assets/icons/folderNotice.png';
   import system from '/@/assets/icons/systemNotice.png';
@@ -439,8 +441,12 @@
 
       function onModalWebSocket(data) {
         if (data.cmd === 'chat') {
-          handleImChatSocket(data);
+          //update-begin---author:xsl ---date:20260528 for：【IM聊天】SysMessageModal 与 notify/index.vue 同时监听 WS，handleImChatSocket 已由 notify 处理，此处只做 UI 刷新-----------
+          // handleImChatSocket 已在 notify/index.vue 的 onWebSocketMessage 中调用
+          // 如果在此重复调用，incrementGroupUnread 和 dispatchImChatSocketUi 会触发两次
+          // 导致 patchGroup(unreadIncrement:1) 执行两次，群聊 tab 角标变为 2（实际只有 1 条消息）
           refreshImUnread(false);
+          //update-end---author:xsl ---date:20260528 for：【IM聊天】SysMessageModal 与 notify/index.vue 同时监听 WS，handleImChatSocket 已由 notify 处理，此处只做 UI 刷新-----------
           if (isImChatUiOpen()) {
             return;
           }