From 42e7b7da955e0383dde15697aa7c266125c023a2 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 27 Aug 2025 10:07:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(AppScenicAccountController):=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=B9=B6=E4=BC=98=E5=8C=96=E6=99=AF=E5=8C=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD-=20=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=20list=20=E4=B8=BA=20Collections.emptyList()?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20-=20=E5=A2=9E=E5=8A=A0=E5=AF=B9=20ADMIN=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=9A=84=E5=A4=84=E7=90=86=EF=BC=8C=E4=BD=BF=E5=85=B6?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E8=8E=B7=E5=8F=96=E6=99=AF=E5=8C=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20-=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=E7=BB=B4=E6=8A=A4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/mobile/manage/AppScenicAccountController.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java
index 8e292ea..0b2e8be 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static com.ycwl.basic.constant.JwtRoleConstant.ADMIN;
 import static com.ycwl.basic.constant.JwtRoleConstant.MERCHANT;
 
 /**
@@ -65,7 +66,7 @@ public class AppScenicAccountController {
 
     @GetMapping("/myScenicList")
     public ApiResponse<List<ScenicRespVO>> myScenicList() {
-        List<ScenicRespVO> list;
+        List<ScenicRespVO> list = Collections.emptyList();
         if (Strings.CS.equals(BaseContextHandler.getRoleId(), MERCHANT.type)) {
             String userId = BaseContextHandler.getUserId();
             ScenicAccountEntity account = accountService.getScenicAccountById(Long.valueOf(userId));
@@ -75,7 +76,7 @@ public class AppScenicAccountController {
             list = account.getScenicId().stream()
                     .map(id -> scenicService.getDetails(id).getData())
                     .toList();
-        } else {
+        } else if (Strings.CS.equals(BaseContextHandler.getRoleId(), ADMIN.type)) {
             list = adminScenicService.list(new ScenicReqQuery()).getData();
         }
         return ApiResponse.success(list);