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 list = memberBasicInfoService.getMerchantListByAuth(deptIds); // List list = memberBasicInfoService.getMerchantListByAuth(); - List list = UserUtils.getMerchantListByAuth(); + // List list = UserUtils.getMerchantListByAuth(); LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail)); + List 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 getMerchantListByAuth() { + /*public static List getMerchantListByAuth() { List 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();