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

Compare commits

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

No commits in common. "4ec7e8d409f5c1704ab8620f39dc21c6c249305e" and "2c4c96cfa4aa940932f1f93b931b0d5d4c668684" have entirely different histories.
4ec7e8d409 ... 2c4c96cfa4

1 changed files with 1 additions and 11 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,18 +63,8 @@ public class DeptController {
@GetMapping("/list")
@Operation(summary = "获取部门列表")
@PreAuthorize("@ss.hasPermission('system:dept:query')")
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) {
public CommonResult<List<DeptRespVO>> getDeptList(DeptListReqVO reqVO) {
if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){
reqVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
}