From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg
---
src/main/java/com/nq/service/impl/StockDzServiceImpl.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
index e225249..3c8ce9d 100644
--- a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
@@ -55,10 +55,6 @@
@Override
public ServerResponse getDzList(int pageNum, int pageSize, String orderBy, String keyWords, HttpServletRequest request) {
PageHelper.startPage(pageNum, pageSize);
- if (keyWords == null || keyWords.trim().isEmpty()) {
- // 如果 keyWords 为空,则直接返回空分页结果
- return ServerResponse.createBySuccess(new RPageInfo());
- }
String formatDate = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
List<StockDz> stockTypeDz = stockMapper.findStockTypeDz(orderBy, keyWords,formatDate);
RPageInfo pageInfo = new RPageInfo();
--
Gitblit v1.9.3