ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(system): 优化部门信息获取功能

Browse Source 
- 修改了 DeptService 接口，增加了 method 参数以
This commit is contained in:
furongxin 2025-01-09 10:10:16 +08:00
parent 1fcb34677e
commit 0e8ca79912
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
View File

@ -132,7 +132,7 @@ public class DeptApiImpl implements DeptApi {
@Override
@DataPermission(enable = false)
public CommonResult<List<DeptRespDTO>> getCompanyDept() {
List<DeptDO> deptDOS = deptService.getCompanyDept();
List<DeptDO> deptDOS = deptService.getCompanyDept(2);
return success(BeanUtils.toBean(deptDOS, DeptRespDTO.class));
}

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

@ -271,9 +271,10 @@ public class DeptController {
@GetMapping("/getCompanyDept")
@Operation(summary = "获取部门类型为公司的部门信息")
@Parameter(name = "method", description = "查询类型 | 1全部 2真实公司 3隐藏公司")
@DataPermission(enable = false)
public CommonResult<List<DeptSimpleRespVO>> getCompanyDept() {
List<DeptDO> list = deptService.getCompanyDept();
public CommonResult<List<DeptSimpleRespVO>> getCompanyDept(@RequestParam(name = "method", required = false, defaultValue = "2") Integer method) {
List<DeptDO> list = deptService.getCompanyDept(method);
return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java
View File

@ -75,7 +75,7 @@ public class AttendancePunchRecordController {
@GetMapping("/getMissingCardRecord")
@Operation(summary = "获得本月用户缺卡记录")
@PreAuthorize("@ss.hasPermission('attendance:punch-record:query')")
// @PreAuthorize("@ss.hasPermission('attendance:punch-record:query')")
public CommonResult<List<AttendancePunchRecordRespVO>> getPunchRecord() {
// 获取当前用户已申请的补卡记录

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
View File

@ -178,7 +178,7 @@ public class LogInstanceController {
public CommonResult<List<DeptRespVO>> getReadCompanyDept() {
// 获得公司编号列表
List<DeptDO> companyDeptDOs = deptService.getCompanyDept();
List<DeptDO> companyDeptDOs = deptService.getCompanyDept(2);
// 获得用户角色
List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(getLoginUserId()));

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
View File

@ -138,7 +138,7 @@ public interface DeptService {
*
* @return 部门信息列表
*/
List<DeptDO> getCompanyDept();
List<DeptDO> getCompanyDept(Integer method);
/**
* 获取所有工厂部门

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -330,14 +330,16 @@ public class DeptServiceImpl implements DeptService {
@Override
@DataPermission(enable = false)
public List<DeptDO> getCompanyDept() {
public List<DeptDO> getCompanyDept(Integer method) {
return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
.eq(method == 2, DeptDO::getVirtuallyStatus, 0)
.eq(method == 3, DeptDO::getVirtuallyStatus, 1)
.eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
.eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue())
.or()
.eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue())
.eq(DeptDO::getVirtuallyStatus, 0)
.eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
.eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue()));
}
@Override