From 4193392c006d1c9e8a1b9856d704e9a8bba72208 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 4 Mar 2024 20:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/system/controller/FileController.java | 4 ----
 .../gxwebsoft/common/system/controller/MainController.java | 7 +++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
index 599cba9..8ecd50e 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
@@ -237,8 +237,6 @@ public class FileController extends BaseController {
         return fail("删除失败");
     }
 
-    @PreAuthorize("hasAuthority('sys:file:list')")
-    @OperationLog
     @ApiOperation("分页查询文件")
     @GetMapping("/page")
     public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
@@ -257,8 +255,6 @@ public class FileController extends BaseController {
         return success(result);
     }
 
-    @PreAuthorize("hasAuthority('sys:file:list')")
-    @OperationLog
     @ApiOperation("查询全部文件")
     @GetMapping("/list")
     public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) {
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index 2bd360e..9bc5040 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -158,14 +158,17 @@ public class MainController extends BaseController {
   public ApiResult<?> tenant() {
     Integer tenantId = getTenantId();
     if (tenantId == null) {
-      throw new BusinessException("缺少参数tenantId");
+      return fail("缺少参数tenantId",null);
     }
     Tenant tenant = tenantService.getByIdRel(tenantId);
     if (tenant == null) {
-      throw new BusinessException("该租户不存在");
+      return fail("该租户不存在或已过期",null);
     }
     // 企业信息
     Company company = companyService.getByTenantIdRel(tenantId);
+    if(company == null){
+      return fail("该租户不存在或已过期",null);
+    }
     company.setBusinessEntity(null);
     company.setPhone(null);
     company.setCompanyCode(null);