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> page(DictDataParam param) { @@ -42,7 +41,6 @@ public class DictDataController extends BaseController { } @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("查询全部字典数据") @GetMapping() public ApiResult> list(DictDataParam param) { @@ -50,7 +48,6 @@ public class DictDataController extends BaseController { } @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("根据id查询字典数据") @GetMapping("/{id}") public ApiResult 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> page(DictionaryDataParam param) { @@ -36,7 +35,6 @@ public class DictionaryDataController extends BaseController { } @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("查询全部字典数据") @GetMapping() public ApiResult> list(DictionaryDataParam param) { @@ -44,7 +42,6 @@ public class DictionaryDataController extends BaseController { } @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("根据id查询字典数据") @GetMapping("/{id}") public ApiResult 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) {