Compare commits
No commits in common. "296af919866b4c66cab7c8b604eb6f9c9e41f89d" and "bec5e56addc81be9814ab26b1c266bd49068aa0f" have entirely different histories.
296af91986
...
bec5e56add
|
@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
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.framework.tenant.core.context.TenantContextHolder;
|
||||||
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.*;
|
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.*;
|
||||||
import cn.iocoder.yudao.module.system.convert.dept.DeptConvert;
|
import cn.iocoder.yudao.module.system.convert.dept.DeptConvert;
|
||||||
|
@ -63,7 +62,6 @@ public class DeptController {
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
@Operation(summary = "获取部门列表")
|
@Operation(summary = "获取部门列表")
|
||||||
@PreAuthorize("@ss.hasPermission('system:dept:query')")
|
@PreAuthorize("@ss.hasPermission('system:dept:query')")
|
||||||
@TenantIgnore
|
|
||||||
public CommonResult<List<DeptRespVO>> getDeptList(DeptListReqVO reqVO) {
|
public CommonResult<List<DeptRespVO>> getDeptList(DeptListReqVO reqVO) {
|
||||||
if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){
|
if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){
|
||||||
reqVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
|
reqVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
|
||||||
|
|
Loading…
Reference in New Issue