diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/ImGroupMemberManagerController.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/ImGroupMemberManagerController.java index e08c78d..e1fa1f3 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/ImGroupMemberManagerController.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/ImGroupMemberManagerController.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Set; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; @@ -40,12 +39,12 @@ public class ImGroupMemberManagerController { private AdminUserApi adminUserApi; @GetMapping("/list") - @Operation(summary = "获得群成员列表") + @Operation(summary = "获得群成员列表(含已退群成员,由前端按需过滤)") @Parameter(name = "groupId", description = "群编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('im:manager:group:query')") public CommonResult> getGroupMemberList(@RequestParam("groupId") Long groupId) { - // 1. 查询有效群成员 - List members = groupMemberService.getActiveGroupMemberListByGroupId(groupId); + // 1. 查询群全部成员(含已退群) + List members = groupMemberService.getGroupMemberListByGroupId(groupId); if (CollUtil.isEmpty(members)) { return success(Collections.emptyList()); } diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/vo/member/ImGroupMemberManagerRespVO.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/vo/member/ImGroupMemberManagerRespVO.java index 3c93ca2..2618ffd 100644 --- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/vo/member/ImGroupMemberManagerRespVO.java +++ b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/group/vo/member/ImGroupMemberManagerRespVO.java @@ -18,7 +18,22 @@ public class ImGroupMemberManagerRespVO { @Schema(description = "用户头像") private String avatar; + @Schema(description = "组内显示名", example = "三哥") + private String displayUserName; + + @Schema(description = "群显示备注", example = "技术交流群") + private String displayGroupName; + + @Schema(description = "是否免打扰", example = "false") + private Boolean muted; + + @Schema(description = "成员状态", example = "0") + private Integer status; // 参见 CommonStatusEnum 枚举类 + @Schema(description = "入群时间") private LocalDateTime joinTime; + @Schema(description = "退群时间") + private LocalDateTime quitTime; + }