yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java
@@ -129,8 +129,8 @@ @Override @Transactional(rollbackFor = Exception.class) public void generateDeptMonthlySummary(Long deptId, String yearMonth) { // 获取部门所有在职员工 List<HrmEmployeeDO> employees = employeeService.getEmployeeList(null); // 获取部门所有员工(未指定员工状态时查询全部) List<HrmEmployeeDO> employees = employeeService.getEmployeeListByStatus(null); if (CollUtil.isEmpty(employees)) { return; } @@ -146,8 +146,8 @@ @Override @Transactional(rollbackFor = Exception.class) public void generateAllMonthlySummary(String yearMonth) { // 获取所有在职员工 List<HrmEmployeeDO> employees = employeeService.getEmployeeList(null); // 获取所有员工(未指定员工状态时查询全部) List<HrmEmployeeDO> employees = employeeService.getEmployeeListByStatus(null); if (CollUtil.isEmpty(employees)) { return; } yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java
@@ -85,6 +85,14 @@ List<HrmEmployeeDO> getEmployeeList(Collection<Long> ids); /** * 获得指定状态的员工列表 * * @param employeeStatus 员工状态,为 null 时查询全部 * @return 员工列表 */ List<HrmEmployeeDO> getEmployeeListByStatus(Integer employeeStatus); /** * 获得指定状态的员工简单列表 * * @param employeeStatus 员工状态,为 null 时查询全部 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
@@ -356,10 +356,18 @@ @Override public List<HrmEmployeeDO> getEmployeeList(Collection<Long> ids) { if (CollUtil.isEmpty(ids)) { return Collections.emptyList(); } return employeeMapper.selectByIds(ids); } @Override public List<HrmEmployeeDO> getEmployeeListByStatus(Integer employeeStatus) { return employeeMapper.selectListByStatus(employeeStatus); } @Override public List<HrmEmployeeSimpleRespVO> getEmployeeSimpleList(Integer employeeStatus) { List<HrmEmployeeDO> list = employeeMapper.selectListByStatus(employeeStatus); // 填充部门名称