From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 8066de9..85a87de 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
@@ -51,20 +51,30 @@
return list;
}
+
+
@Override
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);
-
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
+ public List<ZfPetNote> getPetNoteByPetId(String pid ) {
+ ZfPetNote zfPetNote = new ZfPetNote();
+ zfPetNote.setPid(pid);
+ LambdaQueryWrapper<ZfPetNote> lqw = buildCondition(zfPetNote);
+ lqw.eq(ZfPetNote::getPid,pid);
+ lqw.orderByDesc(ZfPetNote::getCreateTime);
+ return list(lqw);
+ }
+
+ @Override
public AjaxResult mySave(ZfPetNote zfPetNote) {
//鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
--
Gitblit v1.9.1