From 8983c699ea0b6bd1247e63d421b46940fd8c1427 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Mon, 11 Aug 2025 08:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4session=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4,=20=E5=A4=84=E7=90=86=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=97=B6,=20=E7=A6=BB=E8=81=8C=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E4=B8=8D=E5=9C=A8=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?,=20=20=E4=BC=98=E5=8C=96=E8=AF=B7=E5=81=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RzLeaveDetailServiceImpl.java                | 2 +-
 evo-admin/src/main/resources/application.yml                  | 2 +-
 evo-admin/src/main/resources/mapper/system/SysStaffMapper.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java b/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java
index d7f38dd..f8f76a8 100644
--- a/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java
+++ b/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java
@@ -174,7 +174,7 @@ public class RzLeaveDetailServiceImpl extends ServiceImpl<RzLeaveDetailMapper, R
                 Long dayNum = DateUtils.getBetweenDays(firsDay,endDay)+1;
                 List<String> dayList = Collections.emptyList();
                 for (int j = 0; j < dayNum; j++) {
-                    dayList.add(ymd.format(DateUtils.addDays(firsDay, j>0 ? 1 : 0)));
+                    dayList.add(ymd.format(DateUtils.addDays(firsDay, j)));
                 }
                 List<String> holidays = Collections.emptyList();
                 if(ParamUtils.getLeaveTypeNotIncludedFaXiuAndPublicHoliday().contains(flag)){
diff --git a/evo-admin/src/main/resources/application.yml b/evo-admin/src/main/resources/application.yml
index 8a3e627..72ca6cc 100644
--- a/evo-admin/src/main/resources/application.yml
+++ b/evo-admin/src/main/resources/application.yml
@@ -68,7 +68,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 480
+  expireTime: 540
 
 # MyBatis配置
 mybatis-plus:
diff --git a/evo-admin/src/main/resources/mapper/system/SysStaffMapper.xml b/evo-admin/src/main/resources/mapper/system/SysStaffMapper.xml
index ecc776c..9236a02 100644
--- a/evo-admin/src/main/resources/mapper/system/SysStaffMapper.xml
+++ b/evo-admin/src/main/resources/mapper/system/SysStaffMapper.xml
@@ -257,9 +257,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 查询需要发放工资的员工信息 在职员工且入职时间在统计月或以前的或着在统计月离职的员工-->
     <select id="querySysStaffListOfMonth"  resultMap="SysStaffResult">
         <include refid="selectSysStaffVo"/>
-        where del_flag = '0' and  DATE_FORMAT(employment_date, '%Y%m%d') &lt; DATE_FORMAT(#{emplDate} , '%Y%m%d')
-        and (status != '-1' or DATE_FORMAT(quit_date, '%Y%m%d') &gt; DATE_FORMAT(#{quitDate} , '%Y%m%d'))
+        where del_flag = '0' and  DATE_FORMAT(employment_date, '%Y%m%d') &lt; DATE_FORMAT(#{emplDate} , '%Y%m%d') and status != '-1'
     </select>
+    <!--         and (status != '-1' or DATE_FORMAT(quit_date, '%Y%m%d') &gt; DATE_FORMAT(#{quitDate} , '%Y%m%d')) -->
     <!-- 根据部门查询在职且存在的员工 -->
     <select id="queryysStaffByDeptId" parameterType="java.util.List" resultMap="SysStaffResult">
         <include refid="selectSysStaffVo"/>