From af9932d1d6fe3bd56799dcd8b4d76dc993c5c1db Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 6 +++---
1 files changed, 3 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 bcacf86..bab1c58 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());
-
+ 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){
@@ -134,7 +134,7 @@
role.setDeleted(Boolean.FALSE);
roles = systemRoleService.findList(role);
SystemPermission p = new SystemPermission();
- permissions = systemPermissionService.findList(p);
+ permissions = systemPermissionService.findList(p,user.getType());
}else{
roles = systemRoleService.findByUserId(user.getId());
permissions = systemPermissionService.findByUserId(user.getId());
--
Gitblit v1.9.3