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 40027dfb2f2a6f692f6f2f46ac75a307dd764b40..e42199917dcdc520ec3e9d82a96c5ed23dd297c5 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 818ec9e51169a5b3fe6f0be4aa6bdd8b55ee4cd0..1e8e7e6b9467a6918f81fdf31796ce20158b6f4c 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> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) { List 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 5b38ba51b2607459c7d72bc51920f624a6e4306b..ba80f219036e5ba357ff92ace687bbf91c12e13a 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