From d3dad0dc820d7baf365cc10288fdb5094a7babfa Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期四, 19 三月 2026 10:32:41 +0800
Subject: [PATCH] fix(hr): 修复员工信息导入时身份证有效期设置问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index bcad5da..955897d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -80,7 +80,7 @@
queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empDimissionattend.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empDimissionattend.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -99,6 +99,7 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
empDimissionattend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empDimissionattend.setAttendYear(StringUtils.left(empDimissionattend.getAttendMonth(),4));
empDimissionattend.setCreator(operatorId);
empDimissionattend.setModifier(operatorId);
this.save(empDimissionattend);
@@ -108,6 +109,7 @@
@Transactional(rollbackFor = Exception.class)
public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
EmpDimissionAttend dbData = this.getById(empDimissionattend.getDimissionAttendId());
+ empDimissionattend.setAttendYear(StringUtils.left(empDimissionattend.getAttendMonth(),4));
empDimissionattend.setCreateTime(dbData.getCreateTime());
empDimissionattend.setCreator(dbData.getCreator());
empDimissionattend.setDelFlag(dbData.getDelFlag());
--
Gitblit v1.8.0