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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 0c6e2df..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
@@ -36,7 +36,7 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:carusebook:create")
- public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) throws Exception {
LoginUserInfo loginUserInfo = getLoginUser(token);
carUseBook.setCreator(loginUserInfo.getId());
carUseBook.setMemberId(loginUserInfo.getMemberId());
@@ -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);
}
@@ -85,12 +87,12 @@
@GetMapping("/{id}")
@CloudRequiredPermission("business:carusebook:query")
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(carUseBookService.findById(id));
+ return ApiResponse.success(carUseBookService.findById(id,getLoginUser(token).getMemberId()));
}
@ApiOperation("鏌ヨ杞﹁締棰勭害璁板綍")
@PostMapping("/carUseBookList")
- public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<List<CarUseBook>> carUseBookList (@RequestBody CarUseBook carUseBook, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) throws Exception {
return ApiResponse.success(carUseBookService.carUseBookList(carUseBook));
}
@@ -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