From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 fae5612..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,14 +36,14 @@
@GetMapping("/list")
@ApiOperation("查询店铺资质")
//@PreAuthorize("@el.check('customer:storeQualification:list')")
- public ResponseEntity<?> getQualifications(@PathVariable Long storeId) {
+ 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);
+ BeanUtil.copyProperties(i, view, CopyOptions.create().setIgnoreNullValue(true));
view.setType(i.getQualificationType());
view.setName(i.getQualificationName());
view.setImageUrl(i.getQualificationImageUrl());
--
Gitblit v1.9.3