From e89a721ba7f0d85fc5c3af6bbbaf4f4eeaece2d4 Mon Sep 17 00:00:00 2001
From: beeajax <1105173470@qq.com>
Date: Tue, 18 Jul 2023 17:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=99=A8=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/impl/SchCollectorVersionLogDaoImpl.java    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java
index 3848e23..f18fe88 100644
--- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java
+++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java
@@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.docus.core.util.Func;
 import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
@@ -86,15 +87,10 @@ public class SchCollectorVersionLogDaoImpl extends BaseDaoImpl<SchCollectorVersi
             Date endTime = searchDTO.getEndTime();
             query.le(SchCollectorVersionLog::getCreateTime, endTime);
         }
-        //关键字比较，多个列or
-        //if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
-        //单个列用like
-        //query. like(SchCollectorVersionLog::getxxx, searchDTO.getKeyword());
-        //多个列用like
-        //query. and(sub -> sub.like(SchCollectorVersionLog::getxx1, searchDTO.getKeyword())
-        // оr(). like(SchCollectorVersionLog::getXX2, searchDTO.getKeyword()))
-        //);
-        //}
+        Object collectorId = searchDTO.getParams("collectorId");
+        if (Func.isNotEmpty(collectorId)) {
+            query.eq(SchCollectorVersionLog::getCollectorId, collectorId);
+        }
         //默认createTime倒序排序
         query.orderByDesc(SchCollectorVersionLog::getCreateTime);
         List<SchCollectorVersionLog> list = super.find(query);