From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 31 一月 2024 09:37:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java b/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java index 015e23f..951ea62 100644 --- a/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java +++ b/server/company/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java @@ -72,14 +72,14 @@ @PostMapping("/page") @RequiresPermissions("business:applychagnedetail:query") public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) { - return ApiResponse.success(applyChagneDetailService.findPage(pageWrap)); + return ApiResponse.success(applyChagneDetailService.findPageForCompany(pageWrap)); } @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:applychagnedetail:exportExcel") public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) { - ExcelExporter.build(ApplyChagneDetail.class).export(applyChagneDetailService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃", response); + ExcelExporter.build(ApplyChagneDetail.class).export(applyChagneDetailService.findPageForCompany(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃", response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3