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/ZTravelBaseServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
index c1af08f..ee06a02 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
@@ -4,14 +4,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.MapUtils;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.*;
-import com.ruoyi.domain.ZTravelBase;
-import com.ruoyi.domain.ZTravelBase;
 import com.ruoyi.domain.ZTravelBase;
 import com.ruoyi.mapper.ZTravelBaseMapper;
 import com.ruoyi.service.ZTravelBaseService;
@@ -125,6 +120,11 @@
                 .between(zTravelBase.getHappenStartTime()!=null && zTravelBase.getHappenEndTime()!=null,ZTravelBase::getHappenTime,zTravelBase.getHappenStartTime(),zTravelBase.getHappenEndTime())
                 .like(StringUtils.isNotEmpty(zTravelBase.getAddress()),ZTravelBase::getAddress,zTravelBase.getAddress())
                 .like(StringUtils.isNotEmpty(zTravelBase.getPeople()),ZTravelBase::getPeople,zTravelBase.getPeople())
+                .eq(zTravelBase.getTotalPrice()!=null,ZTravelBase::getTotalPrice,zTravelBase.getTotalPrice())
+                .like(StringUtils.isNotEmpty(zTravelBase.getTravelPeriod()),ZTravelBase::getTravelPeriod,zTravelBase.getTravelPeriod())
+                .like(StringUtils.isNotEmpty(zTravelBase.getCertificate()),ZTravelBase::getCertificate,zTravelBase.getCertificate())
+                .eq(zTravelBase.getSelf()!=null,ZTravelBase::getSelf,zTravelBase.getSelf())
+                .like(StringUtils.isNotEmpty(zTravelBase.getRemark()),ZTravelBase::getRemark,zTravelBase.getRemark())
                 .like(StringUtils.isNotEmpty(zTravelBase.getTitle()),ZTravelBase::getTitle,zTravelBase.getTitle());
         lqw.orderByDesc(ZTravelBase::getCreateTime);
         return lqw;

--
Gitblit v1.9.1