From e25154a1579c7b48d4f84574fa59b43a58675676 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 06 五月 2023 09:15:27 +0800
Subject: [PATCH] 增加了一个depth来表示要显示第几代

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index 5a26611..f61f637 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -13,6 +13,7 @@
 import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.ZfCollection;
 import com.ruoyi.domain.ZfCollection;
+import com.ruoyi.domain.ZfCollection;
 import com.ruoyi.mapper.ZfCollectionMapper;
 import com.ruoyi.service.ZInfoUserService;
 import com.ruoyi.service.ZfCollectionService;
@@ -56,7 +57,8 @@
         lqw.like(StringUtils.isNotEmpty(zfCollection.getPrice()),ZfCollection::getPrice,zfCollection.getPrice());
         lqw.like(StringUtils.isNotEmpty(zfCollection.getLocation()),ZfCollection::getLocation,zfCollection.getLocation());
         lqw.like(StringUtils.isNotEmpty(zfCollection.getRemark()),ZfCollection::getRemark,zfCollection.getRemark());
-        lqw.like(zfCollection.getGetTime()!=null,ZfCollection::getGetTime,zfCollection.getGetTime());
+        lqw.eq(zfCollection.getHappenTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenTime());
+        lqw.between(zfCollection.getHappenStartTime() != null && zfCollection.getHappenEndTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenStartTime(), zfCollection.getHappenEndTime());
         return lqw;
     }
 
@@ -139,7 +141,7 @@
 
         }
 
-        lqw.orderByDesc(ZfCollection::getId);
+        lqw.orderByDesc(ZfCollection::getCreateTime);
         return lqw;
     }
 

--
Gitblit v1.9.1