From c35d9c6311b6f9ef75b49559a5c6db75e0a43ac6 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期二, 30 七月 2024 20:06:50 +0800 Subject: [PATCH] 修改bug&分享 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java index ed5d32b..2d63a06 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java @@ -11,8 +11,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZProperty; -import com.ruoyi.domain.ZProperty; -import com.ruoyi.domain.ZfProperty; import com.ruoyi.mapper.ZPropertyMapper; import com.ruoyi.service.ZPropertyService; import org.springframework.beans.factory.annotation.Autowired; @@ -67,6 +65,7 @@ .like(StringUtils.isNotEmpty(zProperty.getIsChange()),ZProperty::getIsChange,zProperty.getIsChange()) .like(StringUtils.isNotEmpty(zProperty.getRemark()), ZProperty::getRemark, zProperty.getRemark()) .like(StringUtils.isNotEmpty(zProperty.getTimeLimit()),ZProperty::getTimeLimit,zProperty.getTimeLimit()) + .eq(zProperty.getStatus()!=null,ZProperty::getStatus,zProperty.getStatus()) .between(zProperty.getHappenStartTime() != null && zProperty.getHappenEndTime() != null, ZProperty::getHappenTime, zProperty.getHappenStartTime(), zProperty.getHappenEndTime()) .orderByDesc(ZProperty::getCreateTime); return lqw; -- Gitblit v1.9.1