From 6bd673610b45c8b7af056d296dde17585c886586 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 17:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index c0f201a..575fb48 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -71,6 +71,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:carusebook:query")
public ApiResponse<PageData<CarUseBook>> findPage (@RequestBody PageWrap<CarUseBook> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(carUseBookService.findPage(pageWrap));
}
@@ -78,6 +79,7 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:carusebook:exportExcel")
public void exportExcel (@RequestBody PageWrap<CarUseBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�", response);
}
@@ -102,7 +104,7 @@
@ApiOperation("鐢宠鎾ら攢")
@GetMapping("/revoke")
- public ApiResponse revoke (@RequestParam Integer id, @RequestParam String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse revoke (@RequestParam Integer id,String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
carUseBookService.revoke(id,info,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.9.3