From f27309d45c7ef46b0aea98107b67d0c5b46d4217 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 10:00:26 +0800
Subject: [PATCH] fix: remove broken duplicate page return
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
index 79ecc2a..7a7951c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
@@ -13,13 +13,14 @@
import com.vincent.rsf.server.manager.entity.WaveItem;
import com.vincent.rsf.server.manager.enums.WaveItemExceStatus;
import com.vincent.rsf.server.manager.service.WaveItemService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -33,7 +34,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaveItem, BaseParam> pageParam = new PageParam<>(baseParam, WaveItem.class);
- return R.ok().add(waveItemService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<WaveItem, BaseParam> page = waveItemService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:waveItem:list')")
@@ -109,26 +112,4 @@
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(waveItemService.list(), WaveItem.class), response);
}
-
-
- @PreAuthorize("hasAuthority('manager:waveItem:update')")
- @ApiOperation("鏆傚仠涓嬪彂浠诲姟")
- @PostMapping("/waveItem/pause/pub/{id}")
- public R pausePublicTask(@PathVariable Long id) {
- waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
- .eq(WaveItem::getId, id)
- .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_ITEM_EXCE_PAUSE.val));
- return R.ok();
- }
-
- @PreAuthorize("hasAuthority('manager:waveItem:update')")
- @ApiOperation("缁х画涓嬪彂浠诲姟")
- @PostMapping("/waveItem/continue/pub/{id}")
- public R continuePublicTask(@PathVariable Long id) {
- waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
- .eq(WaveItem::getId, id)
- .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val));
- return R.ok();
- }
-
}
--
Gitblit v1.9.1