Skip to content

Y
yifu-mvp
Commit 90291ee9 authored by wangzb's avatar wangzb
Browse files
Options

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

parents e3ef921c d216fe42
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @ 90291ee9
......@@ -769,6 +769,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.eq(TEmployeeContractInfo::getSettleDomain, contractInfo.getSettleDomain())
.and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
.ne(TEmployeeContractInfo::getId, contractInfo.getId())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
if (Common.isNotNull(contractInfoListZt)) {
for (TEmployeeContractInfo contractInfo1:contractInfoListZt) {
......@@ -1720,6 +1721,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.eq(TEmployeeContractInfo::getSettleDomain, contract.getSettleDomain())
.and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
.ne(TEmployeeContractInfo::getId, contract.getId())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
if (Common.isNotNull(contractInfoListZt)) {
for (TEmployeeContractInfo contractInfo1 : contractInfoListZt) {
......
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