From 8f735d11a4f03a4af3732eb97358ba6c350997a6 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 11 八月 2021 16:07:33 +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