diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/group/AppMemberGroupController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/group/AppMemberGroupController.java index 6b1d68b3..9fbfe0c7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/group/AppMemberGroupController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/group/AppMemberGroupController.java @@ -120,10 +120,11 @@ public class AppMemberGroupController { return success(groupService.getUserList(vo)); } - @GetMapping("/getAdmin") - @Operation(summary = "获取管理列表") - public CommonResult> getAdmin() { - return success(groupService.getAdmin()); + @GetMapping("/checkGroupAdmin") + @Operation(summary = "检测管理员") + public CommonResult checkGroupAdmin() { + return success(groupService.checkGroupAdmin()); } + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java index 70b3b4f9..0e017b05 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java @@ -116,8 +116,7 @@ public interface MemberGroupService { */ PageResult getUserList(MemberUserListVO listVO); - - List getAdmin(); + Long checkGroupAdmin(); /** * 获取用户所在组 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java index 48c03afc..24c116a8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java @@ -159,11 +159,11 @@ public class MemberGroupServiceImpl implements MemberGroupService { } @Override - public List getAdmin() { + public Long checkGroupAdmin() { Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); List memberGroupDOS = memberGroupMapper.selectList(Wrappers.lambdaQuery() .eq(MemberGroupDO::getUserId, loginUserId)); - return memberGroupDOS; + return CollectionUtil.isEmpty(memberGroupDOS)?null:memberGroupDOS.get(0).getId(); } @Override