From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Mon, 14 Jul 2025 16:57:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb --- oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java | 3 ++- 1 files changed, 2 insertions(+), 1 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 fff0767..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,6 +2,7 @@ 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; @@ -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