From a4a10653acb8a7f86aa8c671c4b4b75e8d961b6c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 15:21:48 +0800
Subject: [PATCH] 修复考勤汇总生成与新增节假日报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
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 eefe7a7..f01082f 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
@@ -252,13 +252,17 @@
@Transactional(rollbackFor = Exception.class)
public void deleteEmployee(Long id) {
// 鏍¢獙瀛樺湪
- validateEmployeeExists(id);
+ HrmEmployeeDO employee = validateEmployeeExists(id);
// 绾ц仈鍒犻櫎瀛愯〃
educationMapper.deleteByEmployeeId(id);
workHistoryMapper.deleteByEmployeeId(id);
emergencyContactMapper.deleteByEmployeeId(id);
// 鍒犻櫎鍛樺伐
employeeMapper.deleteById(id);
+ // 鍚屾鍒犻櫎鍏宠仈鐨勭郴缁熺敤鎴凤紝閬垮厤鎵嬫満鍙凤紙鐧诲綍璐﹀彿锛夎娈嬬暀鐨勫鍎胯处鍙峰崰鐢�
+ if (employee.getUserId() != null) {
+ adminUserApi.deleteUser(employee.getUserId());
+ }
}
private HrmEmployeeDO validateEmployeeExists(Long id) {
@@ -340,6 +344,14 @@
@Override
public List<HrmEmployeeDO> getEmployeeList(Collection<Long> ids) {
+ // ids 涓� null 鏃惰〃绀烘煡璇㈠叏閮ㄥ憳宸ワ紙鑰冨嫟姹囨�汇�佽柂閰牳绠楃瓑鎵归噺鍦烘櫙渚濊禆姝よ涔夛級锛�
+ // 鏄惧紡浼犲叆绌洪泦鍚堟椂杩斿洖绌猴紝閬垮厤璇煡鍏ㄥ憳
+ if (ids == null) {
+ return employeeMapper.selectList(null);
+ }
+ if (ids.isEmpty()) {
+ return Collections.emptyList();
+ }
return employeeMapper.selectByIds(ids);
}
--
Gitblit v1.9.3