From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
index 563f75c..148ac82 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
@@ -58,7 +58,8 @@
@ApiOperation("鍒涘缓鍔冲姟鍏徃")
@PostMapping("/createLaborServices")
@CloudRequiredPermission("business:company:create")
- public ApiResponse<Integer> createLaborServices(@RequestBody Company company){
+ public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(companyService.createLaborServices(company));
}
@@ -66,7 +67,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:company:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- companyService.deleteById(id);
+ companyService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -79,7 +80,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- companyService.deleteByIdInBatch(idList);
+ companyService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -87,6 +88,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:company:update")
public ApiResponse updateById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(this.getLoginUser(token));
companyService.updateById(company);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3