diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java index d72b407f..f147139e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java @@ -132,7 +132,7 @@ public class DeptApiImpl implements DeptApi { @Override @DataPermission(enable = false) public CommonResult> getCompanyDept() { - List deptDOS = deptService.getCompanyDept(); + List deptDOS = deptService.getCompanyDept(2); return success(BeanUtils.toBean(deptDOS, DeptRespDTO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java index 2c542e1c..e8be097f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java @@ -271,9 +271,10 @@ public class DeptController { @GetMapping("/getCompanyDept") @Operation(summary = "获取部门类型为公司的部门信息") + @Parameter(name = "method", description = "查询类型 | 1全部 2真实公司 3隐藏公司") @DataPermission(enable = false) - public CommonResult> getCompanyDept() { - List list = deptService.getCompanyDept(); + public CommonResult> getCompanyDept(@RequestParam(name = "method", required = false, defaultValue = "2") Integer method) { + List list = deptService.getCompanyDept(method); return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java index 7347835c..537f72b4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java @@ -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> getPunchRecord() { // 获取当前用户已申请的补卡记录 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java index 442ea62f..7fb6816f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java @@ -178,7 +178,7 @@ public class LogInstanceController { public CommonResult> getReadCompanyDept() { // 获得公司编号列表 - List companyDeptDOs = deptService.getCompanyDept(); + List companyDeptDOs = deptService.getCompanyDept(2); // 获得用户角色 List userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(getLoginUserId())); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java index 6a612c1b..53bd84dd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java @@ -138,7 +138,7 @@ public interface DeptService { * * @return 部门信息列表 */ - List getCompanyDept(); + List getCompanyDept(Integer method); /** * 获取所有工厂部门 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index cd3c7944..5784c05a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -330,14 +330,16 @@ public class DeptServiceImpl implements DeptService { @Override @DataPermission(enable = false) - public List getCompanyDept() { + public List getCompanyDept(Integer method) { return deptMapper.selectList(new LambdaQueryWrapperX() + .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