gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化获取租户信息接口

Browse Source
This commit is contained in:
gxwebsoft
2024-03-04 20:45:16 +08:00
parent 4f9eaab0e2
commit 4193392c00
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gxwebsoft/common/system/controller/FileController.java
View File

@@ -237,8 +237,6 @@ public class FileController extends BaseController {
return fail("删除失败"); return fail("删除失败");
} }
@PreAuthorize("hasAuthority('sys:file:list')")
@OperationLog
@ApiOperation("分页查询文件") @ApiOperation("分页查询文件")
@GetMapping("/page") @GetMapping("/page")
public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) { public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
@@ -257,8 +255,6 @@ public class FileController extends BaseController {
return success(result); return success(result);
} }
@PreAuthorize("hasAuthority('sys:file:list')")
@OperationLog
@ApiOperation("查询全部文件") @ApiOperation("查询全部文件")
@GetMapping("/list") @GetMapping("/list")
public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) { public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) {

7
src/main/java/com/gxwebsoft/common/system/controller/MainController.java
View File

@@ -158,14 +158,17 @@ public class MainController extends BaseController {
public ApiResult<?> tenant() { public ApiResult<?> tenant() {
Integer tenantId = getTenantId(); Integer tenantId = getTenantId();
if (tenantId == null) { if (tenantId == null) {
throw new BusinessException("缺少参数tenantId"); return fail("缺少参数tenantId",null);
} }
Tenant tenant = tenantService.getByIdRel(tenantId); Tenant tenant = tenantService.getByIdRel(tenantId);
if (tenant == null) { if (tenant == null) {
throw new BusinessException("该租户不存在"); return fail("该租户不存在或已过期",null);
} }
// 企业信息 // 企业信息
Company company = companyService.getByTenantIdRel(tenantId); Company company = companyService.getByTenantIdRel(tenantId);
if(company == null){
return fail("该租户不存在或已过期",null);
}
company.setBusinessEntity(null); company.setBusinessEntity(null);
company.setPhone(null); company.setPhone(null);
company.setCompanyCode(null); company.setCompanyCode(null);