common/ruoyi-flex
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

操作日志添加查询条件

Browse Source
This commit is contained in:
dataprince 2023-12-26 10:25:41 +08:00
parent dd3349bf2e
commit 3693ee1a35
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
View File

@ -128,7 +128,7 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
} }
queryWrapper.and(bracket(queryCondition));//所有新增的插叙条件外边用圆括号包括起来 queryWrapper.and(bracket(queryCondition));//所有新增的查询条件外边用圆括号包括起来
return queryWrapper; return queryWrapper;
} }

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View File

@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import cn.hutool.core.util.ArrayUtil;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.MapstructUtils;
@ -73,12 +74,14 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
QueryWrapper queryWrapper = super.buildBaseQueryWrapper() QueryWrapper queryWrapper = super.buildBaseQueryWrapper()
.and(SYS_OPER_LOG.TITLE.like(operLogBo.getTitle())) .and(SYS_OPER_LOG.TITLE.like(operLogBo.getTitle()))
.and(SYS_OPER_LOG.BUSINESS_TYPE.eq(operLogBo.getBusinessType())) .and(SYS_OPER_LOG.BUSINESS_TYPE.eq(operLogBo.getBusinessType()))
.and(SYS_OPER_LOG.BUSINESS_TYPE.in(Arrays.asList(operLogBo.getBusinessTypes())))
.and(SYS_OPER_LOG.STATUS.eq(operLogBo.getStatus())) .and(SYS_OPER_LOG.STATUS.eq(operLogBo.getStatus()))
.and(SYS_OPER_LOG.OPER_NAME.eq(operLogBo.getOperName())) .and(SYS_OPER_LOG.OPER_NAME.eq(operLogBo.getOperName()))
.and(SYS_OPER_LOG.OPER_IP.like(operLogBo.getOperIp())) .and(SYS_OPER_LOG.OPER_IP.like(operLogBo.getOperIp()))
.and(SYS_OPER_LOG.OPER_TIME.between(operLogBo.getParams().get("beginTime"), operLogBo.getParams().get("endTime"))) .and(SYS_OPER_LOG.OPER_TIME.between(operLogBo.getParams().get("beginTime"), operLogBo.getParams().get("endTime")))
.orderBy(SYS_OPER_LOG.OPER_ID.desc()); .orderBy(SYS_OPER_LOG.OPER_ID.desc());
if (ArrayUtil.isNotEmpty(operLogBo.getBusinessTypes())) {
queryWrapper.and(SYS_OPER_LOG.BUSINESS_TYPE.in(Arrays.asList(operLogBo.getBusinessTypes())));
}
return queryWrapper; return queryWrapper;
} }