diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java index fc33f1e35..d80395cc8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java @@ -84,13 +84,4 @@ public interface DictService { */ List getDictData(String dictType); - /** - * 校验指定的字典类型下是否存在指定的字典值 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @return true 表示该字典值在指定字典类型中有效;false 表示无效 - */ - Boolean isValidDictValue(String dictType, String dictValue); - } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java index d5199873d..73fc4c444 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java @@ -23,6 +23,11 @@ public @interface DictPattern { */ String dictType(); + /** + * 分隔符 + */ + String separator(); + /** * 默认校验失败提示信息 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java index 734975aea..558a3438a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java @@ -4,6 +4,7 @@ import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import org.dromara.common.core.service.DictService; import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; /** * 自定义字典值校验器 @@ -17,6 +18,11 @@ public class DictPatternValidator implements ConstraintValidator datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - if (CollUtil.isEmpty(datas)) { - return false; - } - Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); - return map.containsKey(dictValue); - } - }