diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index 5ed55d3..0ba30a2 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -660,6 +660,11 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { add.setIsCancel(CommonStatusEnum.INIT.getCode()); add.setContractStatus(updateBo.getContractStatusCode()); this.updateByCode(add); + if(add.getCompanyId() == null){ + LambdaUpdateWrapper eq = Wrappers.lambdaUpdate().eq(PsContractInfo::getContractCode, add.getContractCode()).eq(PsContractInfo::getDelFlag, 0); + eq.set(PsContractInfo::getCompanyId, null); + baseMapper.update(eq); + } //删除所有服务 QueryWrapper qw2 = Wrappers.query(); @@ -767,11 +772,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { */ public PsContractInfo updateByCode(PsContractInfo info){ baseMapper.update(info, Wrappers.lambdaUpdate().eq(PsContractInfo::getContractCode,info.getContractCode()).eq(PsContractInfo::getDelFlag,0)); - if(info.getCompanyId() == null){ - LambdaUpdateWrapper eq = Wrappers.lambdaUpdate().eq(PsContractInfo::getContractCode, info.getContractCode()).eq(PsContractInfo::getDelFlag, 0); - eq.set(PsContractInfo::getCompanyId, null); - baseMapper.update(eq); - } + return info; }