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/CarsCloudController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
index 01780ac..d0b260c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
@@ -38,6 +38,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:cars:create")
     public ApiResponse create(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        cars.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carsService.create(cars));
     }
 
@@ -45,7 +46,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:cars:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        carsService.deleteById(id);
+        carsService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -58,7 +59,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        carsService.deleteByIdInBatch(idList);
+        carsService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -66,6 +67,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:cars:update")
     public ApiResponse updateById(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        cars.setLoginUserInfo(this.getLoginUser(token));
         carsService.updateById(cars);
         return ApiResponse.success(null);
     }
@@ -81,6 +83,7 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:cars:query")
     public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carsService.findPage(pageWrap));
     }
 
@@ -89,6 +92,7 @@
     @PostMapping("/list")
     @CloudRequiredPermission("business:cars:query")
     public ApiResponse<List<Cars>> findList (@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+       cars.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carsService.findList(cars));
     }
 
@@ -96,6 +100,7 @@
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:cars:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Cars> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(Cars.class).export(carsService.findPage(pageWrap).getRecords(), "杞﹁締淇℃伅琛�", response);
     }
 

--
Gitblit v1.9.3