diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index a8ee9717..e9dc416f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -612,11 +612,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl listDict) { + public String validStandardType(String value, List listDict, boolean mustInput) { // 非空检查 if (StrUtil.isBlank(value)) { - return "'标准类型'不能为空。"; + if (mustInput) { + return "'标准类型'不能为空。"; + } else { + return ""; + } } // 检查授权部门 if (!excelUtils.validDict("esp_standard_type", value, null, null, true, listDict)) { @@ -259,6 +263,10 @@ public class ExcelUtils { public String validAuthDept(String authDept, List listDict, String standardClassification, Map> authDeptMap) { + if (StrUtil.isBlank(authDept) && StrUtil.isBlank(standardClassification)) { + return ""; + } + if (StrUtil.isBlank(standardClassification)) { return "'标准等级分类'不能为空。"; } @@ -365,9 +373,13 @@ public class ExcelUtils { return ""; } - public String validStandardSystem(String value, List listDict) { + public String validStandardSystem(String value, List listDict, boolean mustInput) { if (StrUtil.isBlank(value)) { - return "'标准体系'不能为空。"; + if (mustInput) { + return "'标准体系'不能为空。"; + } else { + return ""; + } } // 检查主起草人 if (!excelUtils.validDict("node_name", value, "laws_tree_node", "id", false, listDict)) { @@ -414,9 +426,13 @@ public class ExcelUtils { return ""; } - public String validPartName(String value, List listDict) { + public String validPartName(String value, List listDict, boolean mustInput) { if (StrUtil.isBlank(value)) { - return "零部件名称不能为空。"; + if (mustInput) { + return "'零部件名称'不能为空。"; + } else { + return ""; + } } // 检查工作组 if (!excelUtils.validDict("part_name", value, null, null, true, listDict)) {