From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中,对happyActivity的categoryId进行了非空检查,并且确认categoryMap中包含该categoryId后,再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```

---
 src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 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 422b085..6d4da95 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
@@ -8,6 +8,7 @@
 import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
 import cc.mrbird.febs.mall.service.ICommonService;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -53,4 +54,42 @@
     public List<AppVersion> findAppVersion() {
         return appVersionMapper.selectList(null);
     }
+
+    @Override
+    public void addDataDic(String type, String code, Object value, String description) {
+        addDataDic(type, code, value, description, true);
+    }
+
+    @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);
+            return;
+        }
+
+        dic = new DataDictionaryCustom();
+        dic.setCode(code);
+        dic.setType(type);
+        dic.setValue(data);
+        dic.setDescription(description);
+        dataDictionaryCustomMapper.insert(dic);
+    }
+
+    @Override
+    public String getDicByTypeAndCode(String type, String code) {
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+        if (dic != null) {
+            return dic.getValue();
+        }
+        return null;
+    }
 }

--
Gitblit v1.9.1