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/CheckOrderItemController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index 76683cd..0ed0cd1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
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 io.swagger.annotations.Api;
@@ -21,7 +22,7 @@
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.*;
/**
@@ -44,7 +45,9 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
- return R.ok().add(checkOrderItemService.page(pageParam, wrapper));
+ PageParam<WkOrderItem, BaseParam> page = checkOrderItemService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:check:list')")
@@ -107,10 +110,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(WkOrderItem::getAsnCode, condition);
+ wrapper.like(WkOrderItem::getOrderCode, condition);
}
checkOrderItemService.page(new Page<>(1, 20), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getAsnCode()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getOrderCode()))
);
return R.ok().add(vos);
}
--
Gitblit v1.9.1