q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(AppScenicAccountController):修复并优化景区列表获取功能- 初始化 list 为 Collections.emptyList()，避免空指针异常

Browse Source 
- 增加对 ADMIN 角色的处理，使其能够获取景区列表
- 优化代码结构，提高可读性和维护性
This commit is contained in:
Jerry Yan
2025-08-27 10:07:14 +08:00
parent 6bc94a65a6
commit 42e7b7da95
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java
View File

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