From d7b6f020d3b6cce69f19f5198da95513c5d57b32 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:53:14 +0800
Subject: [PATCH] 1.系统管理中系统参数增加了将配置项写入缓存的功能 2.系统管理启动时将配置项写入缓存 3.员工基本信息增加了年假字段 4.员工基本信息服务增加了计算年假的功能

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 9299d50..606ab46 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -272,7 +272,7 @@
         queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
         queryWrapper.eq("a.remindFlag", 0);
         queryWrapper.in("a.contractStatus", contractStatus);
-        queryWrapper.between("a.diffDay", -diffDay, diffDay);
+        queryWrapper.le("a.diffDay", diffDay);
         queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));
 
         queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

--
Gitblit v1.8.0