Commit 69b08b53 authored by hongguangwu's avatar hongguangwu

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

parents c3a10711 cb3d7bcf
...@@ -418,7 +418,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -418,7 +418,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
} catch (Exception e) { } catch (Exception e) {
// 更新合同: // 更新合同:
if (Common.isNotNull(contract.getContractId())) { if (Common.isNotNull(contract.getContractId())) {
TEmployeeContractInfo empContract = contractInfoService.getById(contractPre.getContractId()); TEmployeeContractInfo empContract = contractInfoService.getById(contract.getContractId());
empContract.setDeleteFlag(CommonConstants.ONE_INT); empContract.setDeleteFlag(CommonConstants.ONE_INT);
contractInfoService.updateById(empContract); contractInfoService.updateById(empContract);
} }
......
...@@ -200,6 +200,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -200,6 +200,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
CONTRACT_IGNORE_FIELD.add("createName"); CONTRACT_IGNORE_FIELD.add("createName");
CONTRACT_IGNORE_FIELD.add("updateBy"); CONTRACT_IGNORE_FIELD.add("updateBy");
CONTRACT_IGNORE_FIELD.add("id"); CONTRACT_IGNORE_FIELD.add("id");
CONTRACT_IGNORE_FIELD.add("timeoutElecSign");
} }
private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>(); private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>();
...@@ -229,6 +230,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -229,6 +230,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
SOCIAL_IGNORE_FIELD.add("createName"); SOCIAL_IGNORE_FIELD.add("createName");
SOCIAL_IGNORE_FIELD.add("updateBy"); SOCIAL_IGNORE_FIELD.add("updateBy");
SOCIAL_IGNORE_FIELD.add("id"); SOCIAL_IGNORE_FIELD.add("id");
SOCIAL_IGNORE_FIELD.add("expectedCollectionType");
} }
@Override @Override
......
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