From ecbf7b49b68b0b7c476ba2b295a9a3ec119dc451 Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Mon, 19 Feb 2024 18:02:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=AD=89=E7=BA=A7=E4=B8=8D=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1035534 --user=王旭 【用例管理】建议不区分大小写，并且给出具体不能为空的字段名称 https://www.tapd.cn/55049933/s/1462436 --- .../excel/validate/CustomFieldSelectValidator.java | 3 +++ .../metersphere/system/dto/excel/ExcelValidateHelper.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldSelectValidator.java b/backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldSelectValidator.java index 45ff6794cb..e180e1138d 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldSelectValidator.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldSelectValidator.java @@ -43,6 +43,9 @@ public class CustomFieldSelectValidator extends AbstractCustomFieldValidator { prepareCache(customField); Set idSet = optionValueSetCache.get(customField.getFieldId()); Set textSet = optionTextSetCache.get(customField.getFieldId()); + if (customField.getFieldName().equals(Translator.get("custom_field.functional_priority"))) { + value = value.toUpperCase(); + } if (!idSet.contains(value) && !textSet.contains(value)) { CustomFieldValidateException.throwException(String.format(Translator.get("custom_field_select_tip"), customField.getFieldName(), textSet)); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java index ada979a4dc..d1b45dbef0 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/excel/ExcelValidateHelper.java @@ -1,5 +1,6 @@ package io.metersphere.system.dto.excel; +import com.alibaba.excel.annotation.ExcelProperty; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.validation.ConstraintViolation; @@ -7,6 +8,7 @@ import jakarta.validation.Validator; import jakarta.validation.groups.Default; import org.springframework.stereotype.Component; +import java.lang.reflect.Field; import java.util.Set; @Component @@ -22,7 +24,10 @@ public class ExcelValidateHelper { Set> set = excelValidateHelper.validator.validate(obj, Default.class); if (set != null && !set.isEmpty()) { for (ConstraintViolation cv : set) { - result.append(cv.getMessage()).append("; "); + Field declaredField = obj.getClass().getDeclaredField(cv.getPropertyPath().toString()); + ExcelProperty annotation = declaredField.getAnnotation(ExcelProperty.class); + //拼接错误信息，包含当前出错数据的标题名字+错误信息 + result.append(annotation.value()[0] + cv.getMessage()).append("; "); } } return result.toString();