zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:f240bcd408015f81e193d2099836485a0926a8c9
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:269323dca553fc94c6cd16a39bf122a96d5c48a5
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

No commits in common. "f240bcd408015f81e193d2099836485a0926a8c9" and "269323dca553fc94c6cd16a39bf122a96d5c48a5" have entirely different histories.
f240bcd408 ... 269323dca5

4 changed files with 42 additions and 37 deletions
Show Stats Expand all files Collapse all files

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
View File

@ -103,9 +103,10 @@ public class RechargeOrderController {
@PreAuthorize("@ss.hasPermission('shop:recharge-order:query')") @PreAuthorize("@ss.hasPermission('shop:recharge-order:query')")
@TenantIgnore @TenantIgnore
public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) { public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) {
if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){ if(!TenantContextHolder.ID_SYSTEM.equals(TenantContextHolder.getRequiredTenantId())){
pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId()); pageVO.setTenantId(TenantContextHolder.getRequiredTenantId());
} }
pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
PageResult<RechargeOrderRespVO> pageResult = rechargeOrderService.getRechargeOrderPage(pageVO); PageResult<RechargeOrderRespVO> pageResult = rechargeOrderService.getRechargeOrderPage(pageVO);
return success(pageResult); return success(pageResult);
} }

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/AdminUserController.java
View File

@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult; 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.aop.TenantIgnore;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO; import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO;
@ -103,8 +102,8 @@ public class AdminUserController {
@PreAuthorize("@ss.hasPermission('member:user:query')") @PreAuthorize("@ss.hasPermission('member:user:query')")
@TenantIgnore @TenantIgnore
public CommonResult<PageResult<AdminUserInfoRespVO>> findPageList(@RequestBody AdminUserQueryDTO queryDTO) { public CommonResult<PageResult<AdminUserInfoRespVO>> findPageList(@RequestBody AdminUserQueryDTO queryDTO) {
if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){ if(!TenantContextHolder.ID_SYSTEM.equals(TenantContextHolder.getRequiredTenantId())){
queryDTO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId()); queryDTO.setTenantId(TenantContextHolder.getRequiredTenantId());
} }
// 获得用户分页列表 // 获得用户分页列表
PageResult<MemberUserDO> pageResult = userService.findPageList(queryDTO); PageResult<MemberUserDO> pageResult = userService.findPageList(queryDTO);

23
yudao-ui-admin/src/router/index.js
View File

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

42
yudao-ui-admin/src/views/index.vue
View File

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