From d03235da8bb2383836554f55185aa0dfa07dc68d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Fri, 18 Mar 2022 09:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BA=94=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/pms/ocp/common/utils/ExcelUtils.java      | 1 -
 .../pms/ocp/controller/ApiBasicManagementController.java    | 1 -
 .../ocp/service/impl/TenantBasicManagementServiceImpl.java  | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java b/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java
index 40027df..e421999 100644
--- a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java
+++ b/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java
@@ -91,7 +91,6 @@ public class ExcelUtils {
         }
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(fileName, fileName, ExcelType.XSSF), pojoClass, list);
         response.setCharacterEncoding("UTF-8");
-
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
         ServletOutputStream out = response.getOutputStream();
diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
index 818ec9e..1e8e7e6 100644
--- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
@@ -211,7 +211,6 @@ public class ApiBasicManagementController {
     @GetMapping("/apiBaseTreeList")
     public ResponseVO<List<OcpApiBase>> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) {
         List<OcpApiBase> apiBaseList = apiBasicManagementService.apiBaseTreeApiList(apiGroupCompanyCode, apiGroupCode);
-
         return ResponseVO.ok(apiBaseList);
     }
 
diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
index 5b38ba5..ba80f21 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -117,7 +117,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         for (String s : tenantCode) {
             OcpTenantSubs ocpTenantSubs = new OcpTenantSubs();
             ocpTenantSubs.setTenantCode(s);
-            ocpTenantSubs.setSubsCompanyCode("1");
+            if (StringUtils.isEmpty(companyCode)) {
+                ocpTenantSubs.setSubsCompanyCode(companyCode);
+            } else {
+                ocpTenantSubs.setSubsCompanyCode("1");
+            }
             ocpTenantSubs.setSubsLogTenantAtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpTenantSubs.setSubsLogTenantCtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpTenantSubs.setSubsLogTenantMtime(Timestamp.valueOf(LocalDateTime.now()));
-- 
2.26.0