采集器版本日志

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
+        Object collectorId = searchDTO.getParams("collectorId");
-        //if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
+        if (Func.isNotEmpty(collectorId)) {
-        //单个列用like
+            query.eq(SchCollectorVersionLog::getCollectorId, collectorId);
-        //query. like(SchCollectorVersionLog::getxxx, searchDTO.getKeyword());
+        }
-        //多个列用like
-        //query. and(sub -> sub.like(SchCollectorVersionLog::getxx1, searchDTO.getKeyword())
-        // оr(). like(SchCollectorVersionLog::getXX2, searchDTO.getKeyword()))
-        //);
-        //}
         //默认createTime倒序排序
         query.orderByDesc(SchCollectorVersionLog::getCreateTime);
         List<SchCollectorVersionLog> list = super.find(query);