WFC/agt-cloud
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 导出全部数据和商务角色过滤

Browse Source
This commit is contained in:
caiyuchao
2025-09-16 12:02:13 +08:00
parent 39205b51eb
commit 7aae3846b5
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java
View File

@@ -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<CustomerDO> 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());

4
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java
View File

@@ -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<LicenseRespVO> voList = licenseService.getLicensePage(pageReqVO).getList();

3
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java
View File

@@ -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<ProjectRespVO> list = projectService.getProjectPage(pageReqVO).getList();