From b1c4362017f88a6f145e31c06375bc3f2b676696 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:14:44 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 13 ++++++++++---
1 files changed, 10 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..111f58a 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
@@ -6,6 +6,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyPermission;
+import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
@@ -107,8 +108,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 +121,7 @@
user.getCompanyIdList().add(cc.getCompanyId());
}
}
+ permissions = systemPermissionService.findByUserId(user.getId());
}else{
Company company = companyService.findById(user.getCompanyId());
if(company == null){
@@ -134,12 +135,18 @@
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());
}
}
+
+ SystemRole rt = new SystemRole();
+ rt.setDeleted(Boolean.FALSE);
+ //鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎
+ user.setDepartIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
+
LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
// 楠岃瘉鐢ㄦ埛
return new SimpleAuthenticationInfo(userInfo, user.getPassword(), this.getName());
--
Gitblit v1.9.3