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/WaveRuleController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
index 91072c0..70ce506 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
@@ -11,12 +11,16 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.WaveRule;
import com.vincent.rsf.server.manager.service.WaveRuleService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
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
@@ -30,7 +34,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaveRule, BaseParam> pageParam = new PageParam<>(baseParam, WaveRule.class);
- return R.ok().add(waveRuleService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<WaveRule, BaseParam> page = waveRuleService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:waveRule:list')")
@@ -59,6 +65,10 @@
waveRule.setCreateTime(new Date());
waveRule.setUpdateBy(getLoginUserId());
waveRule.setUpdateTime(new Date());
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_RULE_CODE, null);
+ if (!StringUtils.isBlank(ruleCode)) {
+ waveRule.setCode(ruleCode);
+ }
if (!waveRuleService.save(waveRule)) {
return R.error("Save Fail");
}
--
Gitblit v1.9.1