From b3031dcc88c88a27bcd991be3eb13d1ba1659dcb Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 15 八月 2023 17:43:39 +0800 Subject: [PATCH] 修復bug --- server/src/main/java/doumeemes/api/business/SalaryParamController.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/doumeemes/api/business/SalaryParamController.java b/server/src/main/java/doumeemes/api/business/SalaryParamController.java index db825bd..d405ec3 100644 --- a/server/src/main/java/doumeemes/api/business/SalaryParamController.java +++ b/server/src/main/java/doumeemes/api/business/SalaryParamController.java @@ -7,10 +7,12 @@ import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; import doumeemes.dao.business.model.SalaryParam; +import doumeemes.dao.business.vo.SalaryParamVO; +import doumeemes.dao.ext.dto.SalaryParamDTO; import doumeemes.service.business.SalaryParamService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -33,7 +35,7 @@ @PreventRepeat @ApiOperation("鏂板缓") @PostMapping("/create") - @RequiresPermissions("business:salaryparam:create") +// @RequiresPermissions("business:salaryparam:create") public ApiResponse create(@RequestBody SalaryParam salaryParam) { return ApiResponse.success(salaryParamService.create(salaryParam)); } @@ -69,16 +71,16 @@ @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") - @RequiresPermissions("business:salaryparam:query") - public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParam> pageWrap) { +// @RequiresPermissions("business:salaryparam:query") + public ApiResponse<PageData<SalaryParamVO>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) { return ApiResponse.success(salaryParamService.findPage(pageWrap)); } @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:salaryparam:exportExcel") - public void exportExcel (@RequestBody PageWrap<SalaryParam> pageWrap, HttpServletResponse response) { - ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response); + public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) { + ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3