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); }