Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCertRecordServiceImpl.java

@@ -73,7 +73,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 		TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
-				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.ne(TEmployeeContractInfo::getSituation,"终止")
+				.ne(TEmployeeContractInfo::getSituation,"作废")
 				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
 				.orderByAsc(TEmployeeContractInfo::getContractStart)
 				.last(CommonConstants.LAST_ONE_SQL));
@@ -82,9 +83,11 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 		TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
-				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.ne(TEmployeeContractInfo::getSituation,"终止")
+				.ne(TEmployeeContractInfo::getSituation,"作废")
 				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
-				.orderByDesc(TEmployeeContractInfo::getCreateTime)
+				.isNotNull(TEmployeeContractInfo::getContractEnd)
+				.orderByDesc(TEmployeeContractInfo::getContractEnd)
 				.last(CommonConstants.LAST_ONE_SQL));
 		TCertRecordVo vo = new TCertRecordVo();
 		vo.setEmpIdcard(project.getEmpIdcard());