From 659705e70d567f704bc81f232dbbf135ed7b76a7 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 11 Nov 2023 16:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=99=BB=E5=BD=95=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8UserUtils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pile/MemberBasicInfoController.java    |  3 ++-
 .../main/java/com/jsowell/pile/util/UserUtils.java    | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
index 0b696f331..7be1b8e8f 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
@@ -77,9 +77,10 @@ public class MemberBasicInfoController extends BaseController {
         RestApiResponse<?> response = null;
         // List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
         // List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth();
-        List<MerchantInfoVO> list = UserUtils.getMerchantListByAuth();
+        // List<MerchantInfoVO> list = UserUtils.getMerchantListByAuth();
         LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
         logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
+        List<MerchantInfoVO> list = loginUserDetail.getMerchantInfoVOList();
         if (CollectionUtils.isEmpty(list)) {
             list = new ArrayList<>();
         }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java
index 9c49d2973..27152b6b5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java
@@ -92,7 +92,7 @@ public class UserUtils {
     /**
      * 获取当前会员中的运营商列表（带权限校验）
      */
-    public static List<MerchantInfoVO> getMerchantListByAuth() {
+    /*public static List<MerchantInfoVO> getMerchantListByAuth() {
         List<MerchantInfoVO> resultList = Lists.newArrayList();
         // 获取登录用户 所有有权限运营商
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -135,8 +135,15 @@ public class UserUtils {
             }
         }
         return resultList;
-    }
+    }*/
 
+    /**
+     * 获取登录用户信息
+     * 返回信息包含：
+     * 一级运营商idList
+     * 有权限的运营商信息list
+     * @return LoginUserDetailVO 登录用户详情VO
+     */
     public static LoginUserDetailVO getLoginUserDetail() {
         LoginUserDetailVO resultVO = new LoginUserDetailVO();