You've already forked FrameTour-BE
feat(AppScenicAccountController):修复并优化景区列表获取功能- 初始化 list 为 Collections.emptyList(),避免空指针异常
- 增加对 ADMIN 角色的处理,使其能够获取景区列表 - 优化代码结构,提高可读性和维护性
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user