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

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

@@ -51,7 +51,7 @@ import java.util.List;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/temployeecontractinfo")
+@RequestMapping("/getListByParam")
 @Tag(name = "员工合同管理")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TEmployeeContractInfoController {

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

@@ -351,8 +351,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			}
 			if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[2]) {
 				TEmployeeContractInfo contractInfo = this.getById(tEmployeeContractInfo.getId());
+
+				// 作废、终止，不变为在用
+				if (Common.isEmpty(contractInfo.getSituation())
+						|| (!CommonConstants.dingleDigitStrArray[6].equals(contractInfo.getSituation())
+						&& !CommonConstants.dingleDigitStrArray[7].equals(contractInfo.getSituation()))) {
 					tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING);
+				}
 				tEmployeeContractInfo.setAuditTimeLast(LocalDateTime.now());
+
 				//先停用项目内的其他的员工合同
 				baseMapper.updateInUseStatusById(contractInfo.getEmpId(), contractInfo.getSettleDomain()
 						, contractInfo.getId(), CommonConstants.ONE_STRING);