合同优化

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java

@@ -137,7 +137,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
 	 * 合同岗位
 	 */
 	@Length(max = 32, message = "合同岗位不能超过32个字符")
-	@ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
+	@ExcelAttribute(name = "合同岗位", isNotEmpty = true, errorInfo = "合同岗位不能为空", maxLength = 32, needExport = true)
 	@Schema(description = "合同岗位", name = "post")
 	private String post;
 
@@ -145,7 +145,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
 	 * 工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制
 	 */
 	@Length(max = 32, message = "工时制不能超过32个字符")
-	@ExcelAttribute(name = "工时制", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
+	@ExcelAttribute(name = "工时制", isNotEmpty = true, errorInfo = "工时制不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
 	@Schema(description = "工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
 	private String workingHours;
 

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

@@ -722,7 +722,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			}
 			if (Common.isEmpty(insert.getEmpIdcard()) || Common.isEmpty(insert.getDeptNo())) {
 				errorInfo.append(EmployeeConstants.EMPID_NOT_EMPTY);
-			} else {
+			} else if (EmployeeConstants.SITUATION_SIX.equals(insert.getSituation())
+					|| EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
 				TEmployeeContractInfo contractInfo = this.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 						.eq(TEmployeeContractInfo::getEmpIdcard, insert.getEmpIdcard())
 						.eq(TEmployeeContractInfo::getDeptNo, insert.getDeptNo())