diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java index 089b2538a..eb41832ce 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java @@ -15,6 +15,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; +import com.jsowell.pile.dto.PageDTO; import com.jsowell.pile.service.IPileMerchantInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -122,10 +123,10 @@ public class PileMerchantInfoController extends BaseController { * @return */ @PreAuthorize("@ss.hasPermi('pile:merchant:query')") - @GetMapping("/getFinancialMerchantList") - public TableDataInfo getFinancialMerchantList(PageResponse pageResponse) { - int pageNum = pageResponse.getPageNum() == 0 ? 1 : pageResponse.getPageNum(); - int pageSize = pageResponse.getPageSize() == 0 ? 10 : pageResponse.getPageSize(); + @PostMapping("/getFinancialMerchantList") + public TableDataInfo getFinancialMerchantList(@RequestBody PageDTO dto) { + int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum(); + int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize(); // 权限过滤 AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); if (authorizedMap == null) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PageDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PageDTO.java new file mode 100644 index 000000000..be1af36e1 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PageDTO.java @@ -0,0 +1,16 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * TODO + * + * @author Lemon + * @Date 2023/7/7 13:27 + */ +@Data +public class PageDTO { + private Integer pageSize; + private Integer pageNum; + +} diff --git a/jsowell-ui/src/api/pile/merchant.js b/jsowell-ui/src/api/pile/merchant.js index 66067d6b4..37ef44884 100644 --- a/jsowell-ui/src/api/pile/merchant.js +++ b/jsowell-ui/src/api/pile/merchant.js @@ -53,10 +53,10 @@ export function getMerchantList(query) { } // 财务管理页面获取运营商列表 -export function getFinancialMerchantList(param) { +export function getFinancialMerchantList(data) { return request({ url: '/pile/merchant/getFinancialMerchantList', - method: 'get', - params: param + method: 'post', + data: data }) } diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue index 5cb2a4e49..ed621fe4a 100644 --- a/jsowell-ui/src/views/financial/merchant.vue +++ b/jsowell-ui/src/views/financial/merchant.vue @@ -244,7 +244,8 @@ export default { // 获取运营商列表 getFinancialMerchantList() { const params = { - + pageNum:1, + pageSize:2 } getFinancialMerchantList(params).then((response) => { console.log("response", response)