From d93b232662d6d90f858996769a7d89ff0b4cf88c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:08 +0800
Subject: [PATCH] 重新提交修改了个人记事本bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index 7adbf2e..ae031a8 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -67,7 +67,7 @@
private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
- lqw.orderByDesc(ZfEquipment::getCreateTime);
+ lqw.orderByDesc(ZfEquipment::getHappenTime);
lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName());
lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer());
lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent());
@@ -597,7 +597,7 @@
}
List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId(),2017L);
- if (!memoBookService.removeByIds(memoBookService1))
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
return AjaxResult.error();
}
--
Gitblit v1.9.1