Commit d6dcde1c authored by wangzb's avatar wangzb

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

parents 2918df52 aab3f36b
...@@ -489,6 +489,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -489,6 +489,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过 // 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this.judgeAuditStatus(tEmployeeContractInfo, user); this.judgeAuditStatus(tEmployeeContractInfo, user);
baseMapper.updateById(tEmployeeContractInfo);
//如果是否同步终止合同、减项、减档为是则生成同步任务处理清单 //如果是否同步终止合同、减项、减档为是则生成同步任务处理清单
//增加任务处理情况查询表数据 //增加任务处理情况查询表数据
...@@ -1306,7 +1307,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1306,7 +1307,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
&& Common.isNotNull(insert.getChangeContractAndEmployee()) && Common.isNotNull(insert.getChangeContractAndEmployee())
&& CommonConstants.ZERO_STRING.equals(insert.getChangeContractAndEmployee())) { && CommonConstants.ZERO_STRING.equals(insert.getChangeContractAndEmployee())) {
changeStatus(insert, user); changeStatus(insert, user);
baseMapper.updateById(insert);
} }
} }
} }
......
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