|
|
|
@ -6,9 +6,7 @@ using Infrastructure.Extensions;
|
|
|
|
|
using Infrastructure.Web.Mvc;
|
|
|
|
|
using Microsoft.AspNetCore.Authorization;
|
|
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
|
using Microsoft.AspNetCore.Mvc.Rendering;
|
|
|
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
|
using System;
|
|
|
|
|
using System.Linq;
|
|
|
|
|
|
|
|
|
|
namespace IoT.Shared.Areas.Admin.Controllers
|
|
|
|
@ -32,29 +30,33 @@ namespace IoT.Shared.Areas.Admin.Controllers
|
|
|
|
|
|
|
|
|
|
public override void ToDisplayModel(User entity, EditUserModel model)
|
|
|
|
|
{
|
|
|
|
|
model.Roles = entity.UserRoles.Select(o => new SelectListItem { Value = o.RoleId.ToString(), Text = o.Role.Name }).ToList();
|
|
|
|
|
//entity.UserRoles.ForEach(o => ViewData.Add(o.RoleId, o.Role.Name));
|
|
|
|
|
model.Roles = entity.UserRoles.Select(o => o.RoleId).ToList();
|
|
|
|
|
entity.UserRoles.ForEach(o => ViewData.Add(o.RoleId, o.Role.Name));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void ToEditModel(User entity, EditUserModel model)
|
|
|
|
|
{
|
|
|
|
|
this.ViewData.MultiSelectList(o => model.Roles, () => this._ajax.GetRoleMultiSelectList(model.Roles.Select(o => Guid.Parse(o.Value))));
|
|
|
|
|
if (entity != null)
|
|
|
|
|
{
|
|
|
|
|
model.Roles = entity.UserRoles.Select(o => o.RoleId).ToList();
|
|
|
|
|
}
|
|
|
|
|
this.ViewData.MultiSelectList(o => model.Roles, () => this._ajax.GetRoleMultiSelectList(model.Roles));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void ToEntity(EditUserModel model, User entity)
|
|
|
|
|
{
|
|
|
|
|
foreach (var roleId in entity.UserRoles.Select(o => o.RoleId).ToList())
|
|
|
|
|
foreach (var id in entity.UserRoles.Select(o => o.RoleId).ToList())
|
|
|
|
|
{
|
|
|
|
|
if (!model.Roles.Any(o => o.Value == roleId.ToString()))
|
|
|
|
|
if (!model.Roles.Any(o => o == id))
|
|
|
|
|
{
|
|
|
|
|
entity.UserRoles.RemoveAll(o => o.RoleId == roleId);
|
|
|
|
|
entity.UserRoles.RemoveAll(o => o.RoleId == id);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
foreach (var role in model.Roles)
|
|
|
|
|
foreach (var id in model.Roles)
|
|
|
|
|
{
|
|
|
|
|
if (!entity.UserRoles.Any(o => o.RoleId.ToString() == role.Value))
|
|
|
|
|
if (!entity.UserRoles.Any(o => o.RoleId == id))
|
|
|
|
|
{
|
|
|
|
|
entity.UserRoles.Add(new UserRole { RoleId = Guid.Parse(role.Value) });
|
|
|
|
|
entity.UserRoles.Add(new UserRole { RoleId = id });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|