From a1431c5cb198c42d8830969a9a35710fddbc92c0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 17 十一月 2022 17:33:32 +0800
Subject: [PATCH] !251 add 新增字典数据映射注解,根据字段数据(sys_dict_data表).dict_type 的 value 映射对应的 label Merge pull request !251 from itino/dev-itino

---
 ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

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 7ef60d1..2950283 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
@@ -1,5 +1,6 @@
 package com.ruoyi.common.jackson;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
@@ -29,9 +30,10 @@
     @Override
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         try {
-            String label = SpringUtils.getBean(DictService.class).getDictLabel(dictType, value);
-            if (StrUtil.isNotBlank(label)) {
-                gen.writeString(label);
+            DictService dictService = SpringUtils.getBean(DictService.class);
+            if (ObjectUtil.isNotNull(dictService)) {
+                String label = dictService.getDictLabel(dictType, value);
+                gen.writeString(StrUtil.isNotBlank(label) ? label : value);
             } else {
                 gen.writeString(value);
             }

--
Gitblit v1.9.3