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 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 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" +