From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 27 十月 2023 10:37:49 +0800
Subject: [PATCH] bug修改：148（历史数据导入报错，当前分类没有设置编码规则，未找父级的编码规则的bug）；150（主数据新增时未先找当前层级的编码规则，再向上查找的bug）
---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java
index 2b7a3e2..424fa68 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java
@@ -85,10 +85,9 @@
public final static String PASSWORD_KEY = "password";
public final static String GRANT_TYPE_KEY = "grant_type";
public final static String REFRESH_TOKEN_KEY = "refresh_token";
+ public final static String USER_LOCK = "褰撳墠鐧诲綍鐢ㄦ埛宸茶鍋滅敤锛岃鑱旂郴绠＄悊瑙ｅ皝璐﹀彿銆�";
private static BladeTenantProperties tenantProperties;
- @Autowired
- private static NacosConfigCache nacosConfigCache;
/**
* 鑾峰彇绉熸埛閰嶇疆
@@ -172,7 +171,7 @@
if (tenant == null || tenant.getId() == null) {
throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT);
}
- if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), nacosConfigCache.getAdminUserInfo().getTenantId())) {
+ if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), NacosConfigCache.getAdminUserInfo().getTenantId())) {
return false;
}
if (getTenantProperties().getLicense()) {
--
Gitblit v1.9.3