From 024cc5e9e6fd51e3b0e14e8d3f76c63f1351a4f7 Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期四, 21 十二月 2023 12:25:35 +0800
Subject: [PATCH] 获取集团分类根节点前端传null传入后端直接改为空字符串bug修复
---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java
index 3d5f4e6..9679f27 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java
@@ -86,9 +86,14 @@
// 鏋勫缓鎺堟潈淇℃伅
User user = result.getData().getUser();
Kv detail = result.getData().getDetail();
- if (user == null || user.getId() == null) {
+
+ if (Func.isEmpty(user) || Func.isEmpty(user.getId())) {
throw new InvalidGrantException("passwordfree grant failure, user is null");
}
+ // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁琚仠鐢�
+ if(user.getUserStatus() == 1){
+ throw new InvalidGrantException(TokenUtil.USER_LOCK);
+ }
bladeUserDetails = new BladeUserDetails(user.getId(),
tenantId, result.getData().getOauthId(), user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(result.getData().getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
user.getName(), AuthConstant.ENCRYPT + user.getPassword(), detail, true, true, true, true,
--
Gitblit v1.9.3