From d764a28d914571e7a6c62d85b6e81e70328ecfdb Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 23 十一月 2024 17:32:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
index 3fd42c7..bb4103e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
@@ -36,6 +36,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywcontractbill:create")
     public ApiResponse create(@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContractBill.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywContractBillService.create(ywContractBill));
     }
 
@@ -43,7 +44,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywcontractbill:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        ywContractBillService.deleteById(id);
+        ywContractBillService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -56,7 +57,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        ywContractBillService.deleteByIdInBatch(idList);
+        ywContractBillService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -64,6 +65,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywcontractbill:update")
     public ApiResponse updateById(@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContractBill.setLoginUserInfo(this.getLoginUser(token));
         ywContractBillService.updateById(ywContractBill);
         return ApiResponse.success(null);
     }
@@ -72,6 +74,7 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywcontractbill:query")
     public ApiResponse<PageData<YwContractBill>> findPage (@RequestBody PageWrap<YwContractBill> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywContractBillService.findPage(pageWrap));
     }
 
@@ -79,6 +82,7 @@
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywcontractbill:exportExcel")
     public void exportExcel (@RequestBody PageWrap<YwContractBill> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(YwContractBill.class).export(ywContractBillService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓璐﹀崟淇℃伅琛�", response);
     }
 
@@ -86,6 +90,7 @@
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:ywcontractbill:query")
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+
         return ApiResponse.success(ywContractBillService.findById(id));
     }
 }

--
Gitblit v1.9.3