From 80e5ee8049eefe7039d77048f43e6e0566a07953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 09:10:43 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
index cbe345a..706a703 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import net.sf.jsqlparser.expression.NullValue;
@@ -42,11 +42,15 @@
@Override
public boolean ignoreTable(String tableName) {
- return Arrays.asList(
- "sys_host",
- "sys_user_role",
- "sys_role_menu"
- ).contains(tableName);
+ if (getTenantId() == null) {
+ return true;
+ }else {
+ return Arrays.asList(
+ "sys_host",
+ "sys_user_role",
+ "sys_role_menu"
+ ).contains(tableName);
+ }
}
};
@@ -76,7 +80,7 @@
} catch (Exception e) {
System.out.println(e.getMessage());
}
- return new NullValue();
+ return null;
}
}
--
Gitblit v1.9.1