浏览代码

fix未登录情况下获取不到tenant-id

gqx 2 年之前
父节点
当前提交
06c5460e79
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

+ 3 - 1
jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -166,7 +166,7 @@ public class HotelController extends WebConfig {
     @ApiOperation(value = "可入住酒店列表", notes = "可入住酒店列表")
     @ApiOperation(value = "可入住酒店列表", notes = "可入住酒店列表")
     @GetMapping(value = "/can-use-hotel-list")
     @GetMapping(value = "/can-use-hotel-list")
     @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
     @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
-    public Result<IPage<BusHotel>> getCanUseHotelList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+    public Result<IPage<BusHotel>> getCanUseHotelList(HttpServletRequest request,@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       @RequestParam(name = "sort", defaultValue = "0") Integer sort,
                                                       @RequestParam(name = "sort", defaultValue = "0") Integer sort,
                                                       @RequestParam(name = "city", defaultValue = "") String city,
                                                       @RequestParam(name = "city", defaultValue = "") String city,
@@ -175,6 +175,8 @@ public class HotelController extends WebConfig {
                                                       @RequestParam(name = "lng", defaultValue = "0") BigDecimal lng) {
                                                       @RequestParam(name = "lng", defaultValue = "0") BigDecimal lng) {
         Page<BusHotel> page = new Page<BusHotel>(pageNo, pageSize);
         Page<BusHotel> page = new Page<BusHotel>(pageNo, pageSize);
         String tenantId = TenantContextHolder.getTenantId();
         String tenantId = TenantContextHolder.getTenantId();
+        if (StringUtils.isBlank(tenantId))
+            tenantId = request.getHeader("tenant-id");
         IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, city, keyWord, sort, lat, lng);
         IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, city, keyWord, sort, lat, lng);
         return Result.OK(pageList);
         return Result.OK(pageList);
     }
     }