From 951d65a44165825ad8d323108236a6647467c21a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 27 十二月 2024 11:14:30 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java index 1c9b466..124eb08 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java @@ -98,6 +98,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:bookings:query") public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(bookingsService.findPage(pageWrap)); } @@ -105,6 +106,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:bookings:exportExcel") public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response); } @@ -112,7 +114,7 @@ @GetMapping("/{id}") @CloudRequiredPermission("business:bookings:query") public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - return ApiResponse.success(bookingsService.getMeetingDetail(id)); + return ApiResponse.success(bookingsService.getMeetingDetail(id,getLoginUser(token).getId())); } @ApiOperation("鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅") @@ -149,7 +151,6 @@ @PostMapping("/exportUserStatistics") @CloudRequiredPermission("business:bookings:exportExcel") public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords(); if (!CollectionUtils.isEmpty(records)){ JSONArray o = (JSONArray) JSON.toJSON(records); -- Gitblit v1.9.3