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

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

@@ -47,6 +47,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -251,8 +252,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						.eq(TEmployeeContractInfo::getContractStart, tEmployeeContractInfo.getContractStart())
 						.eq(TEmployeeContractInfo::getContractEnd, tEmployeeContractInfo.getContractEnd())
 						.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_INT)
-						.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT)
-						.or().eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_INT)
+						.and(obj->obj.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ZERO_INT)
+								.or()
+								.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_INT)
+						)
 						.last(CommonConstants.LAST_ONE_SQL));
 				if (contractInfo != null) {
 					return R.failed("不能重复添加");