From 7504b809da1a6188dfa03c06be3eb0f0a9fd0c8e Mon Sep 17 00:00:00 2001 From: zepengdev <lzpsmith@outlook.com> Date: Mon, 16 Jun 2025 21:39:25 +0800 Subject: [PATCH] fix(store):修复店铺分页查询异常 --- oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java index 7d24181..4a9ee6e 100644 --- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java +++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java @@ -1,5 +1,7 @@ package com.oying.modules.pc.store.rest; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjUtil; import com.oying.utils.R; @@ -34,20 +36,18 @@ @GetMapping("/list") @ApiOperation("查询店铺资质") //@PreAuthorize("@el.check('customer:storeQualification:list')") - public ResponseEntity<?> getList(@PathVariable Long storeId) { - if (ObjUtil.isEmpty(storeId)) { - return ResponseEntity.ok(R.success(ListUtil.empty())); - } + public ResponseEntity<?> getQualificationsByStoreId(@PathVariable Long storeId) { StoreQualificationQueryCriteria criteria = new StoreQualificationQueryCriteria(); criteria.setStoreId(storeId); List<StoreQualification> qualificationList = storeQualificationService.queryAll(criteria); - List<CustomerStoreQualificationView> viewList = Optional.ofNullable(qualificationList).orElse(ListUtil.empty()).stream().map(i -> { - CustomerStoreQualificationView view = new CustomerStoreQualificationView(); - BeanUtils.copyProperties(i, view); - view.setType(i.getQualificationType()); - view.setName(i.getQualificationName()); - view.setImageUrl(""); - return view; + List<CustomerStoreQualificationView> viewList = Optional.ofNullable(qualificationList).orElse(ListUtil.empty()) + .stream().map(i -> { + CustomerStoreQualificationView view = new CustomerStoreQualificationView(); + BeanUtil.copyProperties(i, view, CopyOptions.create().setIgnoreNullValue(true)); + view.setType(i.getQualificationType()); + view.setName(i.getQualificationName()); + view.setImageUrl(i.getQualificationImageUrl()); + return view; }).collect(Collectors.toList()); return ResponseEntity.ok(R.success(viewList)); } -- Gitblit v1.9.3