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 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 list = super.find(query);