Commit 6fe5a0f3 authored by hongguangwu's avatar hongguangwu

MVP1.7.1 预入职更新在项时的薪资人员

parent 730c0a90
...@@ -1525,7 +1525,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1525,7 +1525,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
newEmp.setBankCity(tPreEmployeeInfo.getBankCity()); newEmp.setBankCity(tPreEmployeeInfo.getBankCity());
newEmp.setBankNo(tPreEmployeeInfo.getBankNo()); newEmp.setBankNo(tPreEmployeeInfo.getBankNo());
String taxMonth = tPreEmployeeInfo.getTaxMonth(); String taxMonth = tPreEmployeeInfo.getTaxMonth();
if (Common.isEmpty(tPreEmployeeInfo.getTaxMonth())) { // 2024-11-6 18:23:36 产品倩倩说,有在项,带出来的时候是空,就不用变为当前月
if (Common.isEmpty(tPreEmployeeInfo.getTaxMonth()) && !isMustUpdateSalary) {
taxMonth = DateUtil.getThisMonth(); taxMonth = DateUtil.getThisMonth();
} }
newEmp.setTaxMonth(taxMonth); newEmp.setTaxMonth(taxMonth);
......
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