mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 13:42:07 +08:00
晨丰组织用户登录权限错误问题修复
This commit is contained in:
+1
-1
@@ -155,7 +155,7 @@ public class SecurityFrameworkUtils {
|
|||||||
*/
|
*/
|
||||||
public static boolean isManageEndPoint() {
|
public static boolean isManageEndPoint() {
|
||||||
LoginUser loginUser = getLoginUser();
|
LoginUser loginUser = getLoginUser();
|
||||||
return Objects.equals(loginUser.getUserType(), UserTypeEnum.ADMIN.getValue()) && loginUser.getIsSupAdmin();
|
return Objects.equals(loginUser.getUserType(), UserTypeEnum.ADMIN.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -509,7 +509,7 @@ public class OrganServiceImpl implements OrganService {
|
|||||||
|
|
||||||
//menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
|
//menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
|
||||||
|
|
||||||
if (isSystemTenant(tenant)) { // 系统组织,菜单是全量的
|
if (isSystemTenant(tenant) || (SecurityFrameworkUtils.isCfOrg() && SecurityFrameworkUtils.isManageEndPoint())) { // 系统组织,菜单是全量的
|
||||||
menuIds = CollectionUtils.convertSet(menuService.getMenuList(), MenuDO::getId);
|
menuIds = CollectionUtils.convertSet(menuService.getMenuList(), MenuDO::getId);
|
||||||
} else {
|
} else {
|
||||||
menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
|
menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
|
||||||
|
|||||||
Reference in New Issue
Block a user