From 8e580aad93b43d5a310a3e35788ec2acb3791c30 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 21:57:06 +0800
Subject: [PATCH] fix(hrm): 修复生成考勤统计时员工列表查询为空导致 500

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java            |    8 ++++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java                |    8 ++++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java |    8 ++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java
index dfe2a24..df0c530 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java
+++ b/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;
         }
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java
index 07e15da..abd63c7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java
+++ b/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 鏃舵煡璇㈠叏閮�
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
index 2d1d674..facccce 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
+++ b/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);
         // 濉厖閮ㄩ棬鍚嶇О

--
Gitblit v1.9.3