From 7aae3846b5c4835715e1380e524cfe41c003eb51 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Tue, 16 Sep 2025 12:02:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=92=8C=E5=95=86=E5=8A=A1=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/customer/CustomerController.java | 9 +++++++++ .../controller/admin/license/LicenseController.java | 4 ++++ .../controller/admin/project/ProjectController.java | 3 +++ 3 files changed, 16 insertions(+) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java index fc1bfc6..aeca5e6 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java @@ -15,6 +15,7 @@ import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.excel.core.util.ExcelUtils; import org.agt.framework.ip.core.utils.AreaUtils; import org.agt.framework.security.core.service.SecurityFrameworkService; +import org.agt.module.license.controller.admin.common.vo.CommonExportReqVO; import org.agt.module.license.controller.admin.customer.vo.CustomerImportRespVO; import org.agt.module.license.controller.admin.customer.vo.CustomerPageReqVO; import org.agt.module.license.controller.admin.customer.vo.CustomerRespVO; @@ -38,6 +39,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import static org.agt.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static org.agt.framework.common.pojo.CommonResult.success; @@ -167,9 +169,16 @@ public class CustomerController { public void exportCustomerExcel(@Valid CustomerPageReqVO pageReqVO, HttpServletResponse response) throws IOException { if ("all".equals(pageReqVO.getMode())) { + CommonExportReqVO exportReqVO = BeanUtils.toBean(pageReqVO, CommonExportReqVO.class); + pageReqVO = BeanUtils.toBean(exportReqVO, CustomerPageReqVO.class); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); } PageResult pageResult = customerService.getCustomerPage(pageReqVO); + + if (!securityFrameworkService.hasRole("business")) { + pageReqVO.setIncludeFields(pageReqVO.getIncludeFields().stream() + .filter(c -> !Arrays.asList("contacts", "role", "phone").contains(c)).collect(Collectors.toSet())); + } // 导出 Excel ExcelUtils.writeSelected(response, "", pageReqVO.getSheetName(), CustomerRespVO.class, buildCustomerVOList(pageResult).getList(), pageReqVO.getIncludeFields()); diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java index 1d3b0d2..b7497d3 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java @@ -11,8 +11,10 @@ import org.agt.framework.apilog.core.annotation.ApiAccessLog; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.pojo.PageParam; import org.agt.framework.common.pojo.PageResult; +import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.excel.core.util.ExcelUtils; import org.agt.framework.translate.core.TranslateUtils; +import org.agt.module.license.controller.admin.common.vo.CommonExportReqVO; import org.agt.module.license.controller.admin.license.vo.ImportRespVO; import org.agt.module.license.controller.admin.license.vo.LicenseCodeImportExcelVO; import org.agt.module.license.controller.admin.license.vo.LicenseDetailVO; @@ -138,6 +140,8 @@ public class LicenseController { public void exportLicenseExcel(@Valid LicensePageReqVO pageReqVO, HttpServletResponse response) throws IOException { if ("all".equals(pageReqVO.getMode())) { + CommonExportReqVO exportReqVO = BeanUtils.toBean(pageReqVO, CommonExportReqVO.class); + pageReqVO = BeanUtils.toBean(exportReqVO, LicensePageReqVO.class); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); } List voList = licenseService.getLicensePage(pageReqVO).getList(); diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java index 888cc7a..3cb274b 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java @@ -14,6 +14,7 @@ import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.excel.core.util.ExcelUtils; import org.agt.framework.translate.core.TranslateUtils; +import org.agt.module.license.controller.admin.common.vo.CommonExportReqVO; import org.agt.module.license.controller.admin.license.vo.ImportRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectImportRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectListReqVO; @@ -107,6 +108,8 @@ public class ProjectController { public void exportProjectExcel(@Valid ProjectPageReqVO pageReqVO, HttpServletResponse response) throws IOException { if ("all".equals(pageReqVO.getMode())) { + CommonExportReqVO exportReqVO = BeanUtils.toBean(pageReqVO, CommonExportReqVO.class); + pageReqVO = BeanUtils.toBean(exportReqVO, ProjectPageReqVO.class); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); } List list = projectService.getProjectPage(pageReqVO).getList();