Commit a69fd19e authored by huyuchen's avatar huyuchen

优化修改

parent cb9c9840
...@@ -767,7 +767,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -767,7 +767,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
List<TEmployeeContractInfo> contractInfoListZt = baseMapper.selectList(Wrappers.<TEmployeeContractInfo>query() List<TEmployeeContractInfo> contractInfoListZt = baseMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getEmpId, contractInfo.getEmpId()) .lambda().eq(TEmployeeContractInfo::getEmpId, contractInfo.getEmpId())
.eq(TEmployeeContractInfo::getSettleDomain, contractInfo.getSettleDomain()) .eq(TEmployeeContractInfo::getSettleDomain, contractInfo.getSettleDomain())
.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT) .and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)); .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
if (Common.isNotNull(contractInfoListZt)) { if (Common.isNotNull(contractInfoListZt)) {
for (TEmployeeContractInfo contractInfo1:contractInfoListZt) { for (TEmployeeContractInfo contractInfo1:contractInfoListZt) {
...@@ -1692,7 +1693,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1692,7 +1693,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractInfoListZt = baseMapper.selectList(Wrappers.<TEmployeeContractInfo>query() contractInfoListZt = baseMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getEmpId, contract.getEmpId()) .lambda().eq(TEmployeeContractInfo::getEmpId, contract.getEmpId())
.eq(TEmployeeContractInfo::getSettleDomain, contract.getSettleDomain()) .eq(TEmployeeContractInfo::getSettleDomain, contract.getSettleDomain())
.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT) .and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)); .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
if (Common.isNotNull(contractInfoListZt)) { if (Common.isNotNull(contractInfoListZt)) {
for (TEmployeeContractInfo contractInfo1 : contractInfoListZt) { for (TEmployeeContractInfo contractInfo1 : contractInfoListZt) {
......
...@@ -1412,7 +1412,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1412,7 +1412,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
contractInfoListZt = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query() contractInfoListZt = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getEmpIdcard, vo.getEmpIdCard()) .lambda().eq(TEmployeeContractInfo::getEmpIdcard, vo.getEmpIdCard())
.eq(TEmployeeContractInfo::getDeptNo, vo.getDepartNo()) .eq(TEmployeeContractInfo::getDeptNo, vo.getDepartNo())
.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT) .and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)); .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
if (Common.isNotNull(contractInfoListZt)) { if (Common.isNotNull(contractInfoListZt)) {
for (TEmployeeContractInfo contractInfo1 : 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