From 83ba9be342e7efd45b8ddd9ad626a5f9374507d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 17 Nov 2022 17:42:04 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=20=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=98=A0=E5=B0=84=E6=B3=A8=E8=A7=A3=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/annotation/DictDataMapper.java | 3 +++ .../java/com/ruoyi/common/jackson/DictDataJsonSerializer.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java index a07e133b9..5c14a5520 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java @@ -20,5 +20,8 @@ import java.lang.annotation.Target; @JsonSerialize(using = DictDataJsonSerializer.class) public @interface DictDataMapper { + /** + * 设置字典的type值 (如: sys_user_sex) + */ String dictType() default ""; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java index 295028386..caa059b92 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; import com.ruoyi.common.annotation.DictDataMapper; import com.ruoyi.common.core.service.DictService; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; @@ -33,7 +34,7 @@ public class DictDataJsonSerializer extends JsonSerializer implements Co DictService dictService = SpringUtils.getBean(DictService.class); if (ObjectUtil.isNotNull(dictService)) { String label = dictService.getDictLabel(dictType, value); - gen.writeString(StrUtil.isNotBlank(label) ? label : value); + gen.writeString(StringUtils.isNotBlank(label) ? label : value); } else { gen.writeString(value); }