From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
index 8241636..f387de4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
@@ -37,6 +37,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:ywcontract:create")
public ApiResponse create(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContract.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractService.create(ywContract));
}
@@ -44,7 +45,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:ywcontract:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- ywContractService.deleteById(id);
+ ywContractService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -57,7 +58,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- ywContractService.deleteByIdInBatch(idList);
+ ywContractService.deleteByIdInBatch(idList, this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -65,6 +66,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywcontract:update")
public ApiResponse updateById(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContract.setLoginUserInfo(this.getLoginUser(token));
ywContractService.updateById(ywContract);
return ApiResponse.success(null);
}
@@ -73,6 +75,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:ywcontract:query")
public ApiResponse<PageData<YwContract>> findPage (@RequestBody PageWrap<YwContract> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractService.findPage(pageWrap));
}
@@ -80,6 +83,7 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywcontract:exportExcel")
public void exportExcel (@RequestBody PageWrap<YwContract> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(YwContract.class).export(ywContractService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓淇℃伅琛�", response);
}
--
Gitblit v1.9.3