From 329d9dfb3dc9725637a109baae3b950fb0b01c93 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 29 Dec 2025 17:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/QuickMenuController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java index 63067abaf..dda983a67 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java @@ -1,5 +1,6 @@ package com.czg.controller.admin; +import cn.hutool.core.collection.CollUtil; import com.czg.account.entity.QuickMenu; import com.czg.account.service.QuickMenuService; import com.czg.annotation.SaAdminCheckPermission; @@ -31,12 +32,17 @@ public class QuickMenuController { @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-列表") @GetMapping public CzgResult> getQuickList(Integer status) { - return CzgResult.success(quickMenuService.list(QueryWrapper.create() - .eq(QuickMenu::getShopId, StpKit.USER.getShopId()) - .eq(QuickMenu::getStatus, status) - .orderBy(QuickMenu::getSort, true) - ) - ); + List list = quickMenuService.list(QueryWrapper.create() + .eq(QuickMenu::getShopId, StpKit.USER.getShopId()) + .eq(QuickMenu::getStatus, status) + .orderBy(QuickMenu::getSort, true)); + if (CollUtil.isEmpty(list)) { + list = quickMenuService.list(QueryWrapper.create() + .eq(QuickMenu::getShopId, 1) + .eq(QuickMenu::getStatus, status) + .orderBy(QuickMenu::getSort, true)); + } + return CzgResult.success(list); } @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-新增")