From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 00a3c2c..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,7 +120,7 @@
user.getCompanyIdList().add(cc.getCompanyId());
}
}
- permissions = systemPermissionService.findByUserId(user.getId());
+ permissions = systemPermissionService.findByUserId(user.getId());
}else{
Company company = companyService.findById(user.getCompanyId());
if(company == null){
@@ -135,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