From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java
index deb8507..f395f4c 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java
@@ -5,6 +5,7 @@
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.BooleanUtil;
+import com.oying.modules.pc.store.domain.enums.StoreCategoryEnum;
import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreCategory;
import com.oying.modules.pc.store.domain.dto.StoreCategoryQueryCriteria;
@@ -39,7 +40,7 @@
StoreCategoryQueryCriteria criteria = new StoreCategoryQueryCriteria();
criteria.setStoreId(storeId);
- criteria.setActive(1);
+ criteria.setActive(StoreCategoryEnum.YES.getValue());
List<StoreCategory> categoryList = storeCategoryService.queryAll(criteria);
List<CustomerStoreCategoryView> categoryViewList = Optional.ofNullable(categoryList).orElse(ListUtil.empty()).stream().map(i -> {
--
Gitblit v1.9.3