From cb22e2441394cd61116d64a844708ca9390a0529 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 18:43:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
index cd6b8d8..90f9e84 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZIdea;
-import com.ruoyi.domain.ZIdea;
import com.ruoyi.mapper.ZIdeaMapper;
import com.ruoyi.service.ZIdeaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +58,8 @@
.like(StringUtils.isNotEmpty(zIdea.getBeneficiary()), ZIdea::getBeneficiary, zIdea.getBeneficiary())
.like(StringUtils.isNotEmpty(zIdea.getHeir()), ZIdea::getHeir, zIdea.getHeir())
.like(StringUtils.isNotEmpty(zIdea.getDifficulty()), ZIdea::getDifficulty, zIdea.getDifficulty())
+ .like(StringUtils.isNotEmpty(zIdea.getCause()), ZIdea::getCause, zIdea.getCause())
+ .like(zIdea.getIsEffective()!=null, ZIdea::getIsEffective, zIdea.getIsEffective())
.between(zIdea.getHappenStartTime() != null && zIdea.getHappenEndTime() != null, ZIdea::getHappenTime, zIdea.getHappenStartTime(), zIdea.getHappenEndTime())
.orderByDesc(ZIdea::getCreateTime);
return lqw;
--
Gitblit v1.9.1