From 52e4ba6897d5d808c4ed08720bbebad9cb006103 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 05 十一月 2026 13:48:56 +0800
Subject: [PATCH] fix(hrm): 修复生成考勤统计报错、实出天数翻倍；调岗/离职审批通过同步人员信息
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 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 f2a01a6..f32091d 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
@@ -40,6 +40,7 @@
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserCreateReqDTO;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserUpdateReqDTO;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -69,7 +70,11 @@
*/
@Service
@Validated
+@Slf4j
public class HrmEmployeeServiceImpl implements HrmEmployeeService {
+
+ /** 鍛樺伐鐘舵�侊細绂昏亴锛�1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴锛� */
+ private static final Integer EMPLOYEE_STATUS_RESIGNED = 3;
@Resource
private HrmEmployeeMapper employeeMapper;
@@ -369,10 +374,66 @@
@Override
public List<HrmEmployeeDO> getEmployeeList(Collection<Long> ids) {
+ // 闃插尽锛歁yBatis-Plus 鐨� selectByIds(null) 浼氭姏
+ // BuilderException: The expression 'coll' evaluated to a null value
+ if (CollUtil.isEmpty(ids)) {
+ return new ArrayList<>();
+ }
return employeeMapper.selectByIds(ids);
}
@Override
+ public List<HrmEmployeeDO> getEmployeeListByStatus(Integer employeeStatus) {
+ return employeeMapper.selectListByStatus(employeeStatus);
+ }
+
+ @Override
+ public void syncEmployeeTransfer(Long employeeId, Long targetDeptId, Long targetPostId) {
+ if (employeeId == null) {
+ return;
+ }
+ HrmEmployeeDO employee = employeeMapper.selectById(employeeId);
+ if (employee == null) {
+ log.warn("[syncEmployeeTransfer][鍛樺伐({}) 涓嶅瓨鍦紝璺宠繃璋冨矖鍚屾]", employeeId);
+ return;
+ }
+ if (targetDeptId == null && targetPostId == null) {
+ return;
+ }
+ HrmEmployeeDO updateObj = new HrmEmployeeDO();
+ updateObj.setId(employeeId);
+ if (targetDeptId != null) {
+ updateObj.setDeptId(targetDeptId);
+ }
+ if (targetPostId != null) {
+ // hrm_employee.post_ids 瀛� JSON 鏁扮粍瀛楃涓诧紝濡� [38]
+ updateObj.setPostIds(JSONUtil.toJsonStr(java.util.List.of(targetPostId)));
+ }
+ employeeMapper.updateById(updateObj);
+ log.info("[syncEmployeeTransfer][鍛樺伐({}) 璋冨矖鐢熸晥锛氶儴闂� {} -> {}锛屽矖浣� -> {}]",
+ employeeId, employee.getDeptId(), targetDeptId, targetPostId);
+ }
+
+ @Override
+ public void syncEmployeeResignation(Long systemUserId, java.time.LocalDate leaveDate) {
+ if (systemUserId == null) {
+ return;
+ }
+ HrmEmployeeDO employee = employeeMapper.selectByUserId(systemUserId);
+ if (employee == null) {
+ log.warn("[syncEmployeeResignation][绯荤粺鐢ㄦ埛({}) 娌℃湁瀵瑰簲鍛樺伐妗ｆ锛岃烦杩囩鑱屽悓姝", systemUserId);
+ return;
+ }
+ employeeMapper.updateById(HrmEmployeeDO.builder()
+ .id(employee.getId())
+ .employeeStatus(EMPLOYEE_STATUS_RESIGNED)
+ .leaveDate(leaveDate != null ? leaveDate : java.time.LocalDate.now())
+ .build());
+ log.info("[syncEmployeeResignation][鍛樺伐({}) 绂昏亴鐢熸晥锛岀姸鎬� {} -> {}]",
+ employee.getId(), employee.getEmployeeStatus(), EMPLOYEE_STATUS_RESIGNED);
+ }
+
+ @Override
public List<HrmEmployeeSimpleRespVO> getEmployeeSimpleList(Integer employeeStatus) {
List<HrmEmployeeDO> list = employeeMapper.selectListByStatus(employeeStatus);
// 濉厖閮ㄩ棬鍚嶇О
--
Gitblit v1.9.3