From f7541fc86ca355a038184bfa52c9d2d5c5468e84 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 31 十月 2023 10:00:06 +0800
Subject: [PATCH] 申领单bug
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 4e65f82..16be325 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() {
@@ -868,7 +879,11 @@
}
public static String getTableName(String btmname) {
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY ? "vcibt_" : "pl_code_") + btmname.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY ? "PLBT_CODE" : "PL_CODE_") + btmname.trim().toLowerCase();
+ }
+
+ public static String getTableName(String btmname,Boolean isMdmTable) {
+ return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toLowerCase();
}
public static Field getTsField(Class c) {
--
Gitblit v1.9.3