From 7b5fddf1755d3a1f43e5e402f944e7446caf6500 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 12 八月 2021 14:08:53 +0800
Subject: [PATCH] 请假销假验证
---
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 80e2b79..a2b31ad 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1728,7 +1728,8 @@
hrSalaryDTO.Dianhuafei = SimCost.bill_amount;
}
- if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin)
+ if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin
+ && hrSalaryDTO.Queqin <=0)
{
hrSalaryDTO.Quanqinjiang = hrJibengongzi.Quanqingjiang;
}
--
Gitblit v1.9.1