Browse Source

Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

田爽 9 tháng trước cách đây
mục cha
commit
9e25d351f1
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

+ 1 - 1
src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -586,7 +586,7 @@ namespace Hotline.Settings.TimeLimits
                         var duration =  WorkEndTime - WorkBeginTime;
                         double workMinutes = duration.TotalMinutes;
                         double totalWorkMinutes = (workMinutes * timeValue) * (Percentage/100.00);
-                        double totalWorkMinutesOne = (workMinutes * timeValue) * (Percentage / 50.00);
+                        double totalWorkMinutesOne = (workMinutes * timeValue) * (PercentageOne / 100.00);
                         
                         //判断开始时间不在工时间段修正时间复位至当天或者第二天的开始时间(如果大于结束时间则复位至第二天的开始时间)
                         if (beginTime < WorkBeginTime)