From ae60ad1dd19a86dd9723b199111bc3e2fb45f126 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 03 四月 2026 20:58:59 +0800
Subject: [PATCH] refactor(hr): 移除保险提醒相关冗余代码并调整退休延迟计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
index dd9c9ed..d46cf7a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
@@ -64,6 +64,15 @@
if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
}
+ if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
+ queryWrapper.like("c.allDeptName", empDimissionlog.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
+ queryWrapper.like("b.empName", empDimissionlog.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
+ queryWrapper.like("b.empNumb", empDimissionlog.getEmpNumb());
+ }
Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
--
Gitblit v1.8.0