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

Compare commits

base: zenghuapei:2c4c96cfa4aa940932f1f93b931b0d5d4c668684
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:4ec7e8d409f5c1704ab8620f39dc21c6c249305e
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

2 Commits
2c4c96cfa4 ... 4ec7e8d409

Author SHA1 Message Date
perry 4ec7e8d409 Merge remote-tracking branch 'origin/master' 2023-06-01 13:14:08 +08:00
perry 266f6bec1c 所有部门 2023-06-01 13:13:10 +08:00
1 changed files with 11 additions and 1 deletions
Show Stats Expand all files Collapse all files

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
View File

@ -63,8 +63,18 @@ 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) {
reqVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
List<DeptDO> list = deptService.getDeptList(reqVO);
list.sort(Comparator.comparing(DeptDO::getSort));
return success(DeptConvert.INSTANCE.convertList(list));
}
@GetMapping("/list-all")
@Operation(summary = "获取平台所有部门列表")
@PreAuthorize("@ss.hasPermission('system:dept:query')")
@TenantIgnore
public CommonResult<List<DeptRespVO>> getDeptListAll(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());
} }