From 9dc6e13e7aea2e6e6f8e32fdd2152d4ce9cb76a1 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 18:08:33 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 10980dd..8b7994d 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -107,8 +107,7 @@
List<SystemPermission> permissions =null;
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
if(authenticationToken.getUserType() == 0){
- roles = systemRoleService.findByUserId(user.getId());
- permissions = systemPermissionService.findByUserId(user.getId());
+ roles = systemRoleService.findByUserId(user.getId());
CompanyPermission c = new CompanyPermission();
c.setUserId(user.getId());
c.setIsdeleted(Constants.ZERO);
@@ -121,6 +120,7 @@
user.getCompanyIdList().add(cc.getCompanyId());
}
}
+ permissions = systemPermissionService.findByUserId(user.getId());
}else{
Company company = companyService.findById(user.getCompanyId());
if(company == null){
@@ -141,7 +141,6 @@
}
}
LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
-
// 楠岃瘉鐢ㄦ埛
return new SimpleAuthenticationInfo(userInfo, user.getPassword(), this.getName());
}
--
Gitblit v1.9.3