From 13d7f88734fd6a959e109c56aa0db88ee0bd53bd Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=81=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/home/service/xjgl/XjglServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java index 4a79a92..b245227 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java @@ -120,6 +120,9 @@ public class XjglServiceImpl implements XjglService { public Boolean backDay(Long id) { //通过id 获取销假数据 XjglDO xjglDO = xjglMapper.selectById(id); + if (xjglDO.getQjglType() != 1 ) { + return true; + } // 通过销假数据 设置年假 pagevo 来找到想要修改的年假数据 NjglPageReqVO njglPageReqVO = buildXjglReqVo(xjglDO); @@ -135,9 +138,6 @@ public class XjglServiceImpl implements XjglService { // 这里是销假所以 减少使用天数 增加 剩余天数 // 请假相反 并且还要处理数据状态 upDataNjglDo(njglDO,xjglDO); -// if ((njglRespVO.getUsedDays().compareTo(BigDecimal.ZERO) < 0)&&(njglRespVO.getRemainingDays().compareTo(BigDecimal.valueOf(10)) > 0)) { -// return false; -// } // 更新数据 返回true njglMapper.updateById(njglDO); return true;