Commit f27d237b authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

parents 99589ea6 5923f256
...@@ -74,7 +74,7 @@ public class TConfigSalaryController { ...@@ -74,7 +74,7 @@ public class TConfigSalaryController {
// 当前年 未推送或未发放的 发薪次数 // 当前年 未推送或未发放的 发薪次数
int yearCount = tSalaryStandardService.getNum(settleDepart, null, nowYear); int yearCount = tSalaryStandardService.getNum(settleDepart, null, nowYear);
for (TConfigSalary cs : configSalaryList) { for (TConfigSalary cs : configSalaryList) {
if (cs.getSalaryNum() < monthCount) { if (cs.getSalaryNum() <= monthCount) {
cs.setNowMonthSalaryNum(monthCount); cs.setNowMonthSalaryNum(monthCount);
} }
cs.setNowYearSalaryNum(yearCount); cs.setNowYearSalaryNum(yearCount);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment