Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/impl/AgentLogServiceImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.gglm.bigmodel.maintenance.entity.AgentLogEntity;
 import com.hnac.gglm.bigmodel.maintenance.mapper.AgentLogMapper;
 import com.hnac.gglm.bigmodel.maintenance.service.AgentLogService;
-import com.hnac.gglm.bigmodel.maintenance.entity.AgentLogEntity;
 import com.hnac.gglm.bigmodel.maintenance.vo.IdsRequest;
 import com.hnac.gglm.bigmodel.maintenance.vo.LabelRequest;
 import lombok.AllArgsConstructor;
@@ -66,6 +66,8 @@ public class AgentLogServiceImpl extends ServiceImpl<AgentLogMapper, AgentLogEnt
                 .eq(ObjectUtil.isNotEmpty(req.getChatId()), AgentLogEntity::getChatId, req.getChatId())
                 .eq(ObjectUtil.isNotEmpty(req.getQId()), AgentLogEntity::getQId, req.getQId())
                 .like(ObjectUtil.isNotEmpty(req.getModelName()), AgentLogEntity::getModelName, req.getModelName())
+                .like(StringUtil.isNotBlank(req.getQ()), AgentLogEntity::getQ, req.getQ())
+                .eq(ObjectUtil.isNotEmpty(req.getLabelStatus()), AgentLogEntity::getLabelStatus, req.getLabelStatus())
                 .orderByAsc(AgentLogEntity::getCreateTime)
                 .orderByAsc(AgentLogEntity::getChatId);
         return this.page(page, queryWrapper);