From 49306af1995aec6264410e624bb91db6876f666a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 10:34:47 +0800
Subject: [PATCH] fix(mall):修复小程序登录时公司ID查询错误 - 将查询条件从 apiXcxLoginDto.getCode() 更正为 apiXcxLoginDto.getCompanyId() - 确保公司信息查询使用正确的参数 - 修复因参数错误导致的公司信息无法正确获取的问题

---
 src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 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..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
@@ -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);
@@ -73,4 +83,13 @@
         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