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 |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 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 d795fa8..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
@@ -49,7 +49,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("business:company:create")
-    public ApiResponse create(@RequestBody Company company) {
+    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody Company company) {
+        company.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(companyService.create(company));
     }
 
@@ -57,35 +58,37 @@
     @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));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:company:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        companyService.deleteById(id);
+    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        companyService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:company:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        companyService.deleteByIdInBatch(idList);
+        companyService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:company:update")
-    public ApiResponse updateById(@RequestBody Company company) {
+    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);
     }
@@ -93,7 +96,7 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:company:query")
-    public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
+    public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(companyService.findPage(pageWrap));
     }
 
@@ -103,7 +106,7 @@
             @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true),
     })
     @CloudRequiredPermission("business:company:query")
-    public ApiResponse<List<Company>> tree (@RequestParam Integer type) {
+    public ApiResponse<List<Company>> tree (@RequestParam Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(companyService.companyTree(type));
     }
 
@@ -111,7 +114,7 @@
     @ApiOperation("鎺掑簭")
     @PostMapping("/updateSort")
     @CloudRequiredPermission("business:company:query")
-    public ApiResponse updateSort (@Validated @RequestBody UpdateCompanySortDTO dto) {
+    public ApiResponse updateSort (@Validated @RequestBody UpdateCompanySortDTO dto,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         companyService.updateSort(dto);
         return ApiResponse.success(null);
     }
@@ -120,7 +123,7 @@
     @ApiOperation("淇敼鐘舵��")
     @PostMapping("/updateStatusById")
     @CloudRequiredPermission("business:company:update")
-    public ApiResponse updateStatusById(@RequestBody Company company) {
+    public ApiResponse updateStatusById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         companyService.updateStatusById(company);
         return ApiResponse.success(null);
     }
@@ -128,21 +131,21 @@
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:company:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Company> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<Company> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         ExcelExporter.build(Company.class).export(companyService.findPage(pageWrap).getRecords(), "浼佷笟淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:company:query")
-    public ApiResponse findById(@PathVariable Integer id) {
+    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(companyService.findById(id));
     }
 
     @ApiOperation("鏍规嵁鍒嗙被ID鏌ヨ")
     @PostMapping("/findLaborServicesList")
     @CloudRequiredPermission("business:company:query")
-    public ApiResponse<List<Company>> findLaborServicesList(Company query){
+    public ApiResponse<List<Company>> findLaborServicesList(Company query,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         Company company = new Company();
         company.setIsdeleted(Constants.ZERO);
         company.setType(query.getType());

--
Gitblit v1.9.3