From 2e895c760a6433bf86fc20ac60b003f16e34ddb8 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 23 五月 2023 19:34:08 +0800
Subject: [PATCH] 1561
---
zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
index dddb479..9ee1cb5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
@@ -53,10 +53,10 @@
* 鏍规嵁瀹犵墿id鑾峰彇鐩稿叧澶囧繕褰�
*/
@GetMapping
- public AjaxResult getByPetId(@PathParam("pid")String pid){
+ public AjaxResult getByPetId(@PathParam("pid")String pid,ZfPetNote zfPetNote){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid);
+ return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid,zfPetNote);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
index 0b731bd..ca41b7c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
@@ -21,7 +21,7 @@
List<ZfPetNote> selectByCondition(ZfPetNote zfPetNote);
- AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid);
+ AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid,ZfPetNote zfPetNote);
AjaxResult mySave(ZfPetNote zfPetNote);
}
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 f95d34b..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
@@ -52,8 +52,8 @@
}
@Override
- public AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,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);
--
Gitblit v1.9.1