From e5abdb4e4f88a2b22a444ebd7b69207b07f5c6e4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 11:15:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index b79d2c4..e10a57c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -17,8 +17,10 @@
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.toolmodel.DateConverter;
import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
@@ -50,6 +52,15 @@
private static String localIp = null;
public VciBaseUtil() {
+ }
+
+ /**
+ * 妫�鏌ユ槸鍚︿负閰嶇疆鐨勮秴绠＄鎴峰拰鐢ㄦ埛
+ * @return false涓嶆槸瓒呯锛宼rue鏄秴绠�
+ */
+ public static Boolean checkAdminTenant(){
+ return NacosConfigCache.getAdminUserInfo().getTenantId().equals(AuthUtil.getTenantId())
+ && NacosConfigCache.getAdminUserInfo().getUserName().equals(AuthUtil.getUserName());
}
public static String getPk() {
@@ -872,7 +883,7 @@
}
public static String getTableName(String btmname,Boolean isMdmTable) {
- return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toLowerCase();
+ return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toUpperCase(Locale.ROOT);
}
public static Field getTsField(Class c) {
@@ -1311,7 +1322,6 @@
}
for (Field declaredField : declaredFields) {
declaredField.setAccessible(true);
-
// 鑾峰彇瀛楁鐨勫��
boolean isTableField = declaredField.isAnnotationPresent(TableField.class);
if (isTableField) {
--
Gitblit v1.9.3