From de369b4b3d87a5c1e4c8848c5b0d75fbac45459f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
index 6f2fe47..4f4cd2f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
@@ -57,9 +57,19 @@
@Override
public void addDataDic(String type, String code, Object value, String description) {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+ addDataDic(type, code, value, description, true);
+ }
- String data = JSONObject.toJSONString(value);
+ @Override
+ public void addDataDic(String type, String code, Object value, String description, boolean isJson) {
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+ String data = null;
+ if (isJson) {
+ data = JSONObject.toJSONString(value);
+ } else {
+ data = (String) value;
+ }
+
if (dic != null) {
dic.setValue(data);
dataDictionaryCustomMapper.updateById(dic);
--
Gitblit v1.9.1