From 22d1231a7f66f7998cdecb820939ca0a46f35672 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 29 Jun 2023 09:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90dict=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wrapper/field/dict/DictCodeFormatSerializer.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/kernel-d-wrapper/wrapper-field-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/field/dict/DictCodeFormatSerializer.java b/kernel-d-wrapper/wrapper-field-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/field/dict/DictCodeFormatSerializer.java index f86908fbc..c7aceac60 100644 --- a/kernel-d-wrapper/wrapper-field-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/field/dict/DictCodeFormatSerializer.java +++ b/kernel-d-wrapper/wrapper-field-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/field/dict/DictCodeFormatSerializer.java @@ -1,9 +1,9 @@ package cn.stylefeng.roses.kernel.wrapper.field.dict; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.dict.api.context.DictContext; import cn.stylefeng.roses.kernel.rule.enums.FormatTypeEnum; -import cn.stylefeng.roses.kernel.rule.util.MixFieldTypeUtil; import cn.stylefeng.roses.kernel.wrapper.field.util.CommonFormatUtil; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; @@ -63,14 +63,10 @@ public class DictCodeFormatSerializer extends JsonSerializer { } // 判断当前字段类型是否是String类型，如果不是String类型则直接跳过，因为字典编码是String类型的 - boolean stringFlag = MixFieldTypeUtil.whetherAssignClass(originValue, String.class); - if (!stringFlag) { - jsonGenerator.writeObject(originValue); - return; - } + String dictCode = StrUtil.toString(originValue); // 执行转化，根据字典类型编码，以及字典的编码，获取指定字典的中文名称 - String dictName = DictContext.me().getDictName(this.dictTypeCode, originValue.toString()); + String dictName = DictContext.me().getDictName(this.dictTypeCode, dictCode); // 将转化的值，根据策略，进行写入到渲染的json中 CommonFormatUtil.writeField(formatTypeEnum, originValue, dictName, jsonGenerator);