feat: 年度制修订去掉配合单位字段必填校验

This commit is contained in:
2024-04-09 11:22:48 +08:00
parent 53554e4be0
commit f58f45c6e0
5 changed files with 3 additions and 3 deletions
@@ -321,7 +321,7 @@ public class ProcessEsAnnualInit implements Serializable {
/** /**
* 配合单位 * 配合单位
*/ */
@Excel(name = "*配合单位", width = 15, orderNum = "19") @Excel(name = "配合单位", width = 15, orderNum = "19")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位") @ApiModelProperty(value = "配合单位")
private String cooperationUnit; private String cooperationUnit;
@@ -325,7 +325,7 @@ public class ProcessEsAnnualReport implements Serializable {
/** /**
* 配合单位 * 配合单位
*/ */
@Excel(name = "*配合单位", width = 15, orderNum = "7") @Excel(name = "配合单位", width = 15, orderNum = "7")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位") @ApiModelProperty(value = "配合单位")
private String cooperationUnit; private String cooperationUnit;
@@ -321,7 +321,7 @@ public class ExcelUtils {
public String validCooperateUnit(String value, List<SysDictItemCore> listDict) { public String validCooperateUnit(String value, List<SysDictItemCore> listDict) {
// 非空检查 // 非空检查
if (StrUtil.isBlank(value)) { if (StrUtil.isBlank(value)) {
return "'配合单位'不能为空。"; return "";
} }
// 检查配合单位 // 检查配合单位
if (!excelUtils.validDict("depart_name", value, "sys_depart", "id", false, listDict)) { if (!excelUtils.validDict("depart_name", value, "sys_depart", "id", false, listDict)) {