From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
index 040c6f8..7d82a68 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
@@ -34,14 +34,23 @@
@PostMapping("/create")
@CloudRequiredPermission("business:approvetempl:create")
public ApiResponse create(@RequestBody ApproveTempl approveTempl,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ approveTempl.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(approveTemplService.create(approveTempl));
+ }
+ @PreventRepeat
+ @ApiOperation("鍙戝竷妯＄増")
+ @PostMapping("/save")
+ @CloudRequiredPermission("business:approvetempl:create")
+ public ApiResponse save(@RequestBody ApproveTempl approveTempl,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ approveTempl.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(approveTemplService.save(approveTempl));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:approvetempl:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- approveTemplService.deleteById(id);
+ approveTemplService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -49,7 +58,7 @@
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:approvetempl:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- approveTemplService.deleteByIdInBatch(this.getIdList(ids));
+ approveTemplService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -57,6 +66,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:approvetempl:update")
public ApiResponse updateById(@RequestBody ApproveTempl approveTempl,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ approveTempl.setLoginUserInfo(this.getLoginUser(token));
approveTemplService.updateById(approveTempl);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3