From fe860b399a6889df270ada9921ec3c2828ce9032 Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 30 May 2023 10:59:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/recharge/RechargeOrderController.java   | 5 ++---
 .../member/controller/admin/user/AdminUserController.java    | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
index 314963ab7..9de506f87 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
@@ -103,10 +103,9 @@ public class RechargeOrderController {
     @PreAuthorize("@ss.hasPermission('shop:recharge-order:query')")
     @TenantIgnore
     public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) {
-        if(!TenantContextHolder.ID_SYSTEM.equals(TenantContextHolder.getRequiredTenantId())){
-            pageVO.setTenantId(TenantContextHolder.getRequiredTenantId());
+        if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){
+            pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
         }
-        pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
         PageResult<RechargeOrderRespVO> pageResult = rechargeOrderService.getRechargeOrderPage(pageVO);
         return success(pageResult);
     }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/AdminUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/AdminUserController.java
index 805da29f7..167adc7b7 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/AdminUserController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/AdminUserController.java
@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO;
@@ -102,8 +103,8 @@ public class AdminUserController {
   @PreAuthorize("@ss.hasPermission('member:user:query')")
   @TenantIgnore
   public CommonResult<PageResult<AdminUserInfoRespVO>> findPageList(@RequestBody AdminUserQueryDTO queryDTO) {
-      if(!TenantContextHolder.ID_SYSTEM.equals(TenantContextHolder.getRequiredTenantId())){
-          queryDTO.setTenantId(TenantContextHolder.getRequiredTenantId());
+      if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){
+          queryDTO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
       }
     // 获得用户分页列表
     PageResult<MemberUserDO> pageResult = userService.findPageList(queryDTO);