From 7a6267373cb25b2de2f453b6a8702bfd0b292d0e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 26 Apr 2023 19:28:42 +0800
Subject: [PATCH] 修改机构为默认部门的用户无法登录的问题
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
index ff7ab16..e93e0a6 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
@@ -127,7 +127,7 @@
// 用户不存在,但提示用户名与密码错误并锁定账号
if (user == null || user.getId() == null) {
setFailCount(tenantId, username, count);
- throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
+ throw new UserDeniedAuthorizationException(TokenUtil.USER_NOT_FOUND);
}
// 用户角色不存在
if (Func.isEmpty(userInfo.getRoles())) {
@@ -159,7 +159,8 @@
R<Dept> deptRes = sysClient.getDept(Long.valueOf(deptStr));
if (StringUtil.isBlank(deptRes.getData().getAdCode()))
// 部门为空
- throw new UsernameNotFoundException("没有找到有效组织机构~");
+// throw new UserDeniedAuthorizationException("没有找到有效组织机构~");
+ userInfo.getDetail().set("adCodeBase","");
else
userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
--
Gitblit v1.9.3