From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
index 1db0976..89a400b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -112,6 +112,11 @@
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
+ queryWrapper.like(pageWrap.getModel().getTitle()!=null, ActionLog::getTitle,pageWrap.getModel().getTitle());
+ queryWrapper.like(pageWrap.getModel().getParam()!=null, ActionLog::getParam,pageWrap.getModel().getParam());
+ queryWrapper.like(pageWrap.getModel().getParam2()!=null, ActionLog::getParam2,pageWrap.getModel().getParam2());
+ queryWrapper.like(pageWrap.getModel().getParam3()!=null, ActionLog::getParam3,pageWrap.getModel().getParam3());
+ queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
--
Gitblit v1.9.3