From bd375f4fe8081c0ca612d72ed06c47ab3f89d68d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb'
---
oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java
index d6105be..ef2292b 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java
@@ -2,10 +2,11 @@
import com.oying.modules.pc.category.converter.PlatformCategoryViewAssembler;
import com.oying.modules.pc.category.domain.PlatformCategory;
+import com.oying.modules.pc.category.domain.enums.PlatformCategoryEnum;
import com.oying.modules.pc.category.view.PlatformCategoryCustomerView;
import com.oying.modules.pc.category.domain.dto.PlatformCategoryQueryCriteria;
import com.oying.modules.pc.category.service.PlatformCategoryService;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -35,7 +36,7 @@
//@PreAuthorize("@el.check('customer:platformCategory:list')")
public ResponseEntity<?> queryPlatformCategory() {
PlatformCategoryQueryCriteria criteria = new PlatformCategoryQueryCriteria();
- criteria.setActive(1);
+ criteria.setActive(PlatformCategoryEnum.YES.getValue());
List<PlatformCategory> platformCategoryList = categoryService.queryAll(criteria);
List<PlatformCategoryCustomerView> responseList = platformCategoryList.stream().map(assembler::toCustomerPlatformCategoryResponse).collect(Collectors.toList());
return ResponseEntity.ok(R.success(responseList));
--
Gitblit v1.9.3