From fbc2639629a75fc8b82af44ac23d3fdd6c92b83b Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Thu, 28 Nov 2024 16:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/group/AppMemberGroupController.java   | 9 +++++----
 .../module/member/service/group/MemberGroupService.java  | 3 +--
 .../member/service/group/MemberGroupServiceImpl.java     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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<List<MemberGroupDO>> getAdmin() {
-        return success(groupService.getAdmin());
+    @GetMapping("/checkGroupAdmin")
+    @Operation(summary = "检测管理员")
+    public CommonResult<Long> 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<MemberUserDO> getUserList(MemberUserListVO listVO);
 
-
-    List<MemberGroupDO> 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<MemberGroupDO> getAdmin() {
+    public Long checkGroupAdmin() {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         List<MemberGroupDO> memberGroupDOS = memberGroupMapper.selectList(Wrappers.<MemberGroupDO>lambdaQuery()
                 .eq(MemberGroupDO::getUserId, loginUserId));
-        return memberGroupDOS;
+        return CollectionUtil.isEmpty(memberGroupDOS)?null:memberGroupDOS.get(0).getId();
     }
 
     @Override