From 074485f56f073cf11fb29e6aab4ec9a2d4f3f549 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 19 九月 2024 14:10:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java index e98eae7..b4b243e 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.doumee.api.BaseController; -import com.doumee.config.Jwt.JwtTokenUtil; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.LoginUserInfo; @@ -87,7 +86,7 @@ @PostMapping("/myRoomsPage") public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo user = getLoginUser(token); - pageWrap.getModel().setUserId(user.getId()); + pageWrap.getModel().setUserId(user.getMemberId()); IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap); return ApiResponse.success("鏌ヨ鎴愬姛",page); } -- Gitblit v1.9.3