From 3693ee1a35cc1bfacf381c88a43e6b8d2c46435f Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Tue, 26 Dec 2023 10:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/SysDataScopeServiceImpl.java   | 2 +-
 .../com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
index e6292ce..b3c9304 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
@@ -128,7 +128,7 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
 
         }
 
-        queryWrapper.and(bracket(queryCondition));//所有新增的插叙条件外边用圆括号包括起来
+        queryWrapper.and(bracket(queryCondition));//所有新增的查询条件外边用圆括号包括起来
 
         return queryWrapper;
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index 4f725bf..4eebe31 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import cn.hutool.core.util.ArrayUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.ruoyi.common.core.utils.MapstructUtils;
@@ -73,12 +74,14 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper()
             .and(SYS_OPER_LOG.TITLE.like(operLogBo.getTitle()))
             .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.OPER_NAME.eq(operLogBo.getOperName()))
             .and(SYS_OPER_LOG.OPER_IP.like(operLogBo.getOperIp()))
             .and(SYS_OPER_LOG.OPER_TIME.between(operLogBo.getParams().get("beginTime"), operLogBo.getParams().get("endTime")))
             .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;
     }