Commit 3de8079f authored by hongguangwu's avatar hongguangwu

合同优化-删除的提示语

parent e052cc84
...@@ -6,16 +6,6 @@ public class EmployeeContractConstants { ...@@ -6,16 +6,6 @@ public class EmployeeContractConstants {
public static final String NOT_CREATE_USER = "不是创建人,无法删除"; public static final String NOT_CREATE_USER = "不是创建人,无法删除";
public static final String NOT_AUDIT_STATUS = "不是待审核或审核不通过,无法删除"; public static final String NOT_AUDIT_STATUS = "不是待提交或审核不通过,无法删除";
public static final String searchEmpContractInfo = " 查询对应的员工合同信息!";
public static final String sameEmpOnlyOneStandContract= "同一员工只允许一个在用标准合同,请按员工编码:";
public static final String exportTip = "数据导入解析!数据行数:";
public final static String ContractUpdateFailInfo="合同更新失败:合同更新同步更新派单数据更新失败!";
public final static String UTF8 ="UTF-8";
} }
...@@ -445,11 +445,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -445,11 +445,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
return R.failed("未找到记录"); return R.failed("未找到记录");
} else { } else {
if (!user.getId().equals(contractInfo.getCreateBy())) { if (!user.getId().equals(contractInfo.getCreateBy())) {
return R.failed("不是合同创建人,无法删除"); return R.failed(EmployeeContractConstants.NOT_CREATE_USER);
} }
if (contractInfo.getAuditStatus() != CommonConstants.ZERO_INT if (contractInfo.getAuditStatus() != CommonConstants.ZERO_INT
&& contractInfo.getAuditStatus() != CommonConstants.dingleDigitIntArray[3]) { && contractInfo.getAuditStatus() != CommonConstants.dingleDigitIntArray[3]) {
return R.failed("不是待提交或审核不通过,无法删除"); return R.failed(EmployeeContractConstants.NOT_AUDIT_STATUS);
} }
contractInfo.setDeleteFlag(CommonConstants.ONE_INT); contractInfo.setDeleteFlag(CommonConstants.ONE_INT);
this.updateById(contractInfo); this.updateById(contractInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment