From b8b1930e57b5e5bf631c7f72225407778119e77d Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 29 May 2025 17:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/base/service/impl/ShopBaseProductBrandServiceImpl.java | 2 +-
 .../base/service/impl/ShopBaseProductCategoryServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
index 42e1eb0e..3b9213c9 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
@@ -121,7 +121,7 @@ public class ShopBaseProductBrandServiceImpl extends BaseServiceImpl<ShopBasePro
     public boolean saveOrUpdateBrand(ShopBaseProductBrand shopBaseProductBrand) {
 
         //shopBaseProductBrand.setBrand_name_pinyin("qi ta pin pai");
-        shopBaseProductBrand.setBrand_name_pinyin(PinyinUtil.getPinyin(shopBaseProductBrand.getBrand_name()," "));
+        shopBaseProductBrand.setBrand_name_pinyin(PinyinUtil.getPinyin(shopBaseProductBrand.getBrand_name()));
         shopBaseProductBrand.setBrand_initial(Convert.toStr(shopBaseProductBrand.getBrand_name_pinyin().charAt(0)));
         //shopBaseProductBrand.setBrand_initial("q");
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
index 2d35da50..2fde7ee2 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
@@ -1246,7 +1246,7 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl<ShopBase
         if (CollUtil.isEmpty(map)) {
             QueryWrapper<ShopBaseProductCategory> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("store_id", storeId);
-            queryWrapper.eq("data_source", 2);
+           // queryWrapper.eq("data_source", 2);
             List<ShopBaseProductCategory> categoryList = find(queryWrapper);
             // 类似数据可以放到前端整理
             List<Map> category_tmp_rows = Convert.toList(Map.class, categoryList);