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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.service.*;
 import com.yifu.cloud.plus.v1.yifu.archives.utils.NumberToCN;
@@ -160,7 +161,14 @@ public class SalaryProveController {
 			if (CommonConstants.ZERO_STRING.equals(proveType)) {
 				//正式员工证明
 				//合同信息
-				List<TEmployeeContractInfo> contractList = employeeContractInfoService.list(Wrappers.<TEmployeeContractInfo>lambdaQuery().eq(TEmployeeContractInfo::getEmpId, emId).eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING).orderByDesc(TEmployeeContractInfo::getContractStart));
+				List<TEmployeeContractInfo> contractList = employeeContractInfoService.list(Wrappers.<TEmployeeContractInfo>lambdaQuery()
+						.eq(TEmployeeContractInfo::getEmpId, em.getEmpId())
+						.eq(TEmployeeContractInfo::getSettleDomain, em.getDeptId())
+						.eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING)
+						.ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[0])
+						.ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[6])
+						.isNotNull(TEmployeeContractInfo::getAuditTimeLast)
+						.orderByDesc(TEmployeeContractInfo::getContractStart));
 				if (Common.isNotNull(contractList)) {
 					record.setContractEndDate(contractList.get(0).getContractEnd());
 					record.setContractType(contractList.get(0).getContractType());