From 969dc51644ce68a91211628a04dd4de640f4beb8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 14:16:06 +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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 2f81dd6..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
@@ -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