From 79099023279eb2bdeeb8b800079697e2b8ce0207 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 25 Mar 2024 04:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=AF=E6=8C=81=E4=BC=A0groupId=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/controller/AliOssController.java          | 6 +++++-
 .../common/system/controller/DictDataController.java        | 4 ----
 .../common/system/controller/DictionaryDataController.java  | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
index 95b02e0..e958d71 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
@@ -31,6 +31,7 @@ import com.gxwebsoft.common.system.service.FileRecordService;
 import com.gxwebsoft.common.system.service.SettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -75,7 +76,7 @@ public class AliOssController extends BaseController {
     // 获取租户ID
     String tenantId = request.getHeader("TenantId");
     String companyId = request.getHeader("CompanyId");
-    System.out.println("companyId = " + companyId);
+    String groupId = request.getHeader("GroupId");
     if(StrUtil.isBlank(tenantId)){
       return fail("传参错误",null);
     }
@@ -142,6 +143,9 @@ public class AliOssController extends BaseController {
       if(StrUtil.isNotBlank(companyId)){
         result.setCompanyId(Integer.valueOf(companyId));
       }
+      if(StrUtil.isNotBlank(groupId)){
+        result.setGroupId(Integer.valueOf(groupId));
+      }
       path = "/".concat(path);
       result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName);
       result.setLength(upload.length());
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java
index 1248754..ccd6a9d 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java
@@ -34,7 +34,6 @@ public class DictDataController extends BaseController {
     private DictService dictService;
 
     @PreAuthorize("hasAuthority('sys:dict:list')")
-    @OperationLog
     @ApiOperation("分页查询字典数据")
     @GetMapping("/page")
     public ApiResult<PageResult<DictData>> page(DictDataParam param) {
@@ -42,7 +41,6 @@ public class DictDataController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('sys:dict:list')")
-    @OperationLog
     @ApiOperation("查询全部字典数据")
     @GetMapping()
     public ApiResult<List<DictData>> list(DictDataParam param) {
@@ -50,7 +48,6 @@ public class DictDataController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('sys:dict:list')")
-    @OperationLog
     @ApiOperation("根据id查询字典数据")
     @GetMapping("/{id}")
     public ApiResult<DictData> get(@PathVariable("id") Integer id) {
@@ -92,7 +89,6 @@ public class DictDataController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('sys:dict:update')")
-    @OperationLog
     @ApiOperation("修改字典数据")
     @PutMapping()
     public ApiResult<?> update(@RequestBody DictData dictData) {
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java
index 9a9c1be..bd5c5ba 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java
@@ -28,7 +28,6 @@ public class DictionaryDataController extends BaseController {
     private DictionaryDataService dictionaryDataService;
 
     @PreAuthorize("hasAuthority('sys:dict:list')")
-    @OperationLog
     @ApiOperation("分页查询字典数据")
     @GetMapping("/page")
     public ApiResult<PageResult<DictionaryData>> page(DictionaryDataParam param) {
@@ -36,7 +35,6 @@ public class DictionaryDataController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('sys:dict:list')")
-    @OperationLog
     @ApiOperation("查询全部字典数据")
     @GetMapping()
     public ApiResult<List<DictionaryData>> list(DictionaryDataParam param) {
@@ -44,7 +42,6 @@ public class DictionaryDataController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('sys:dict:list')")
-    @OperationLog
     @ApiOperation("根据id查询字典数据")
     @GetMapping("/{id}")
     public ApiResult<DictionaryData> get(@PathVariable("id") Integer id) {
@@ -73,7 +70,6 @@ public class DictionaryDataController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('sys:dict:update')")
-    @OperationLog
     @ApiOperation("修改字典数据")
     @PutMapping()
     public ApiResult<?> update(@RequestBody DictionaryData dictionaryData) {