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> myScenicList() { - List list; + List 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);