|
|
|
@ -255,7 +255,6 @@ namespace Platform.Data
|
|
|
|
|
if (scopeAttribute != null)
|
|
|
|
|
{
|
|
|
|
|
var scope = scopeAttribute.Scope;
|
|
|
|
|
var isManyToMany = item.ClrType.GetCustomAttribute<ManyToManyAttribute>() != null;
|
|
|
|
|
//平台权限
|
|
|
|
|
if (scope.HasFlag(ScopeType.PlatformRead))
|
|
|
|
|
{
|
|
|
|
@ -265,7 +264,7 @@ namespace Platform.Data
|
|
|
|
|
{
|
|
|
|
|
permissionCatgegory.Permissions.Add(new Permission { IsReadOnly = true, Type = PermissionType.Platform, Name = $"添加平台{name}", Number = $"Add-Platform-{number}" });
|
|
|
|
|
}
|
|
|
|
|
if (!isManyToMany && scope.HasFlag(ScopeType.PlatformEdit))
|
|
|
|
|
if (scope.HasFlag(ScopeType.PlatformEdit))
|
|
|
|
|
{
|
|
|
|
|
permissionCatgegory.Permissions.Add(new Permission { IsReadOnly = true, Type = PermissionType.Platform, Name = $"修改平台{name}", Number = $"Edit-Platform-{number}" });
|
|
|
|
|
}
|
|
|
|
@ -282,7 +281,7 @@ namespace Platform.Data
|
|
|
|
|
{
|
|
|
|
|
permissionCatgegory.Permissions.Add(new Permission { IsReadOnly = true, Type = PermissionType.Organ, Name = $"添加机构{name}", Number = $"Add-Organ-{number}" });
|
|
|
|
|
}
|
|
|
|
|
if (!isManyToMany && scope.HasFlag(ScopeType.OrganEdit))
|
|
|
|
|
if (scope.HasFlag(ScopeType.OrganEdit))
|
|
|
|
|
{
|
|
|
|
|
permissionCatgegory.Permissions.Add(new Permission { IsReadOnly = true, Type = PermissionType.Organ, Name = $"修改机构{name}", Number = $"Edit-Organ-{number}" });
|
|
|
|
|
}
|
|
|
|
@ -490,10 +489,10 @@ namespace Platform.Data
|
|
|
|
|
db.Set<Building>().FirstOrDefault(o => o.Number == "root").Update();
|
|
|
|
|
db.SaveChanges();
|
|
|
|
|
|
|
|
|
|
var defaultOrganId = db.Set<Organ>().FirstOrDefault(o => o.IsReadOnly).Id;
|
|
|
|
|
var superRole = new Role { OrganId = defaultOrganId, Number = "super", Name = "超级管理员", IsReadOnly = true };
|
|
|
|
|
var adminRole = new Role { OrganId = defaultOrganId, Number = "admin", Name = "管理员" };
|
|
|
|
|
var organRole = new Role { OrganId = defaultOrganId, Number = "organ", Name = "机构管理员" };
|
|
|
|
|
var platformOrganId = db.Set<Organ>().FirstOrDefault(o => o.IsReadOnly).Id;
|
|
|
|
|
var superRole = new Role { OrganId = platformOrganId, Number = "super", Name = "超级管理员", IsReadOnly = true };
|
|
|
|
|
var adminRole = new Role { OrganId = platformOrganId, Number = "admin", Name = "管理员" };
|
|
|
|
|
var organRole = new Role { OrganId = platformOrganId, Number = "organ", Name = "机构管理员" };
|
|
|
|
|
|
|
|
|
|
//初始化角色
|
|
|
|
|
var skips = new string[] {
|
|
|
|
@ -529,7 +528,7 @@ namespace Platform.Data
|
|
|
|
|
new OrganUser {
|
|
|
|
|
IsReadOnly=true,
|
|
|
|
|
Type= "",
|
|
|
|
|
OrganId=defaultOrganId,
|
|
|
|
|
OrganId=platformOrganId,
|
|
|
|
|
UserRoles=new List<OrganUserRole>
|
|
|
|
|
{
|
|
|
|
|
new OrganUserRole{
|
|
|
|
@ -557,7 +556,7 @@ namespace Platform.Data
|
|
|
|
|
OrganUsers = new List<OrganUser> {
|
|
|
|
|
new OrganUser {
|
|
|
|
|
Type= "其他",
|
|
|
|
|
OrganId=defaultOrganId,
|
|
|
|
|
OrganId=platformOrganId,
|
|
|
|
|
UserRoles=new List<OrganUserRole>
|
|
|
|
|
{
|
|
|
|
|
new OrganUserRole{ OrganRoleId=adminRole.Id}
|
|
|
|
@ -577,7 +576,7 @@ namespace Platform.Data
|
|
|
|
|
OrganUsers = new List<OrganUser> {
|
|
|
|
|
new OrganUser {
|
|
|
|
|
Type= "其他",
|
|
|
|
|
OrganId=defaultOrganId,
|
|
|
|
|
OrganId=platformOrganId,
|
|
|
|
|
UserRoles=new List<OrganUserRole>
|
|
|
|
|
{
|
|
|
|
|
new OrganUserRole{ OrganRoleId=organRole.Id}
|
|
|
|
|