From cdd1ef49773e49dd91d19f9d02c82fb70e9f658c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 18:07:54 +0800
Subject: [PATCH] zjh20250718

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 7ca2360..ec2858e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -167,6 +167,8 @@
         List<TjUserAdvice> list = userAdviceService.list(wq0);
         List<TjAdvice> kjbqPage = new ArrayList<>();
         Map<String,Object> map = new HashMap<>();
+        map.put("total", 0);
+        map.put("records", null);
         if (null != list && !list.isEmpty()) {
             for (TjUserAdvice advice : list) {
                 TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId());
@@ -177,13 +179,16 @@
             }
             List<TjAdvice> adviceList =null;
             if(StringUtil.isNotBlank( nr)){
-                adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr))
-                        .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+                adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr)).collect(Collectors.toList());
+                List<TjAdvice> tjAdviceList = adviceList.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+                map.put("total", adviceList.size());
+                map.put("records", tjAdviceList);
             }else {
                 adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+                map.put("total", kjbqPage.size());
+                map.put("records", adviceList);
             }
-            map.put("total", kjbqPage.size());
-            map.put("records", adviceList);
+
             return AjaxResult.success(map);
         }
         return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!");

--
Gitblit v1.8.0