From 50c33b34f9e6ae19c003d305e4c0b86cea062bec Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:30:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
index eee2c3a..8ffaf90 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -25,12 +26,12 @@
@Autowired
private WaveOrderRelaService waveOrderRelaService;
- @PreAuthorize("hasAuthority('manager:waveOrderRela:list')")
+ @PreAuthorize("hasAuthority('manager:waveItem:list')")
@PostMapping("/waveOrderRela/page")
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<WaveOrderRela, BaseParam> pageParam = new PageParam<>(baseParam, WaveOrderRela.class);
- return R.ok().add(waveOrderRelaService.page(pageParam, pageParam.buildWrapper(true)));
+ Map<String, Object> param = new HashMap<>();
+ BaseParam baseParam = buildParam(param, BaseParam.class);
+ return waveOrderRelaService.relaPage(baseParam, map);
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:list')")
--
Gitblit v1.9.1