Browse Source

逻辑删除

24282 1 year ago
parent
commit
c5a0699e70

+ 4 - 3
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/interceptor/LogicInterceptor.java

@@ -1,6 +1,7 @@
 package com.ruoyi.framework.mybatis.interceptor;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.JdbcDataSourceStat;
@@ -294,17 +295,17 @@ public class LogicInterceptor extends BaseMultiTableInnerInterceptor implements
             String[] tableNames = logicHolder.getTableNames();
             String[] aliases = logicHolder.getAliases();
 
-            if (tableNames.length == 0 && aliases.length == 0) {
+            if (ObjectUtil.isEmpty(tableNames) && ObjectUtil.isEmpty(aliases)) {
                 return true;
             }
 
-            if (Arrays.asList(tableNames).contains(name)) {
+            if (ObjectUtil.isNotEmpty(tableNames) && Arrays.asList(tableNames).contains(name)) {
                 return true;
             }
 
             Alias alias = table.getAlias();
             if (alias != null) {
-                if (Arrays.asList(aliases).contains(alias.getName())) {
+                if (ObjectUtil.isNotEmpty(aliases) && Arrays.asList(aliases).contains(alias.getName())) {
                     return true;
                 }
             }