Merge branch 'feature/mall_product_new'

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);
     }

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);

yudao-ui-admin/src/router/index.js

@@ -64,22 +64,17 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
-  // {
-  //   path: '',
-  //   component: Layout,
-  //   redirect: 'index',
-  //   children: [{
-  //       path: 'index',
-  //       component: (resolve) => require(['@/views/index'], resolve),
-  //       name: '首页',
-  //       meta: {title: '首页', icon: 'dashboard', affix: true}
-  //     }
-  //   ]
-  // },
   {
-    path:'/',
-      component: Layout,
-      redirect: '/product/store',
+    path: '',
+    component: Layout,
+    redirect: 'index',
+    children: [{
+        path: 'index',
+        component: (resolve) => require(['@/views/index'], resolve),
+        name: '首页',
+        meta: {title: '首页', icon: 'dashboard', affix: true}
+      }
+    ]
   },
   {
     path: '/user',

yudao-ui-admin/src/views/index.vue

@@ -1,31 +1,31 @@
 <template>
   <div class="dashboard-editor-container">
 
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+<!--    <panel-group @handleSetLineChartData="handleSetLineChartData" />-->
 
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
+<!--    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
+<!--      <line-chart :chart-data="lineChartData" />-->
+<!--    </el-row>-->
+
+<!--    <el-row :gutter="32">-->
+<!--      <el-col :xs="24" :sm="24" :lg="8">-->
+<!--        <div class="chart-wrapper">-->
+<!--          <raddar-chart />-->
+<!--        </div>-->
+<!--      </el-col>-->
+<!--      <el-col :xs="24" :sm="24" :lg="8">-->
+<!--        <div class="chart-wrapper">-->
+<!--          <pie-chart />-->
+<!--        </div>-->
+<!--      </el-col>-->
+<!--      <el-col :xs="24" :sm="24" :lg="8">-->
+<!--        <div class="chart-wrapper">-->
+<!--          <bar-chart />-->
+<!--        </div>-->
+<!--      </el-col>-->
+<!--    </el-row>-->
 
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
-    </el-row>
 
-    
   </div>
 </template>