update

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java

@@ -5,9 +5,11 @@ import com.jsowell.common.annotation.Log;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
 import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.core.page.TableDataInfo;
 import com.jsowell.common.enums.BusinessType;
 import com.jsowell.common.exception.BusinessException;
+import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.poi.ExcelUtil;
@@ -121,13 +123,16 @@ public class PileMerchantInfoController extends BaseController {
 	 */
 	@PreAuthorize("@ss.hasPermi('pile:merchant:query')")
 	@GetMapping("/getFinancialMerchantList")
-	public TableDataInfo getFinancialMerchantList() {
+	public TableDataInfo getFinancialMerchantList(PageResponse pageResponse) {
+		int pageNum = pageResponse.getPageNum() == 0 ? 1 : pageResponse.getPageNum();
+		int pageSize = pageResponse.getPageSize() == 0 ? 10 : pageResponse.getPageSize();
 		// 权限过滤
 		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
 		if (authorizedMap == null) {
 			// 为空表示没有权限，返回空数组
 			return new TableDataInfo();
 		}
+		PageUtils.startPage(pageNum, pageSize);
 		return getDataTable(pileMerchantInfoService.queryInfoListByIds(authorizedMap));
 	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java

@@ -262,7 +262,6 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 			String deptId = authorizedMap.getDeptId();
 			deptIds.add(deptId);
 		}
-		PageUtils.startPage();
 		return pileMerchantInfoMapper.queryInfoListByIds(deptIds);
 	}
 }

jsowell-ui/src/api/pile/merchant.js

@@ -53,9 +53,10 @@ export function getMerchantList(query) {
 }
 
 // 财务管理页面获取运营商列表
-export function getFinancialMerchantList() {
+export function getFinancialMerchantList(param) {
     return request({
         url: '/pile/merchant/getFinancialMerchantList',
-        method: 'get'
+        method: 'get',
+        params: param
     })
 }

jsowell-ui/src/views/financial/merchant.vue

@@ -243,7 +243,10 @@ export default {
         },
         // 获取运营商列表
         getFinancialMerchantList() {
-            getFinancialMerchantList().then((response) => {
+            const params = {
+                
+            }
+            getFinancialMerchantList(params).then((response) => {
                 console.log("response", response)
                 this.merchantList = response.rows;
                 console.log("response.total", response.total)