From 46f46c73ef2cf1719f0de7c0258e6bcd4335966c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 25 七月 2023 22:37:08 +0800
Subject: [PATCH] 519648

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
index a9bd871..74f6489 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
@@ -36,7 +36,9 @@
         lqw.orderByDesc(ZfPetNote::getCreateTime);
         Page<ZfPetNote> ZfPetNotePage = new Page<>(pageNum,pageSize);
         Page<ZfPetNote> pageResult = page(ZfPetNotePage, lqw);
+        System.out.println(pageResult);
         HashMap<String, Object> data = MapUtils.getResult(pageResult);
+        System.out.println(data);
         return AjaxResult.success(data);
     }
 
@@ -50,12 +52,16 @@
     }
 
     @Override
-    public AjaxResult getAllPetNoteByPetId(String pid) {
-        LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
+    public AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid,ZfPetNote zfPetNote) {
+        LambdaQueryWrapper<ZfPetNote> lqw = buildCondition(zfPetNote);
         lqw.eq(ZfPetNote::getPid,pid);
         lqw.orderByDesc(ZfPetNote::getCreateTime);
-        List<ZfPetNote> list = list(lqw);
-        return AjaxResult.success(list);
+
+        Page<ZfPetNote> zfPetNotePage = new Page<>(pageNum, pageSize);
+        Page<ZfPetNote> pageResult = page(zfPetNotePage, lqw);
+
+        HashMap<String, Object> result = MapUtils.getResult(pageResult);
+        return AjaxResult.success(result);
     }
 
     @Override

--
Gitblit v1.9.1