调整租户用户设置界面权限设置功能

NewLifeX · Aug 5, 2023 · eb82aab · eb82aab
1 parent 7d02737
commit eb82aab
Showing 1 changed file with 36 additions and 0 deletions.
diff --git a/NewLife.CubeNC/Areas/Admin/Controllers/TenantUserController.cs b/NewLife.CubeNC/Areas/Admin/Controllers/TenantUserController.cs
@@ -14,6 +14,42 @@ static TenantUserController()
  LogOnChange = true;
 
  ListFields.RemoveField("ID", "Remark").RemoveField("CreateUserId", "CreateTime", "CreateIP", "UpdateUserId", "UpdateTime", "UpdateIP");
+
+ {
+ var df = AddFormFields.AddDataField("RoleIds", "RoleNames");
+ df.DataSource = entity => Role.FindAllWithCache().OrderByDescending(e => e.Sort).ToDictionary(e => e.ID, e => e.Name);
+ AddFormFields.RemoveField("RoleNames");
+ }
+ {
+ var df = EditFormFields.AddDataField("RoleIds", "RoleNames");
+ df.DataSource = entity => Role.FindAllWithCache().OrderByDescending(e => e.Sort).ToDictionary(e => e.ID, e => e.Name);
+ EditFormFields.RemoveField("RoleNames");
+ }
+ }
+
+ public TenantUserController()
+ {
+ var TenantId = TenantContext.Current.TenantId;
+ var tenant = Tenant.FindById(TenantId);
+ var RoleIds = tenant?.RoleIds.SplitAsInt(",");
+ // 新增界面
+ {
+ var df = AddFormFields.GetField("RoleIds");
+ df.DataSource = entity => Role.FindAllWithCache().Where(e => TenantId == 0 ? true : RoleIds?.Contains(e.ID) ?? false).OrderByDescending(e => e.Sort).ToDictionary(e => e.ID, e => e.Name);
+ }
+ {
+ var df = AddFormFields.GetField("RoleId");
+ df.DataSource = entity => Role.FindAllWithCache().Where(e => TenantId == 0 ? true : RoleIds?.Contains(e.ID) ?? false).OrderByDescending(e => e.Sort).ToDictionary(e => e.ID, e => e.Name);
+ }
+ // 编辑界面
+ {
+ var df = EditFormFields.GetField("RoleIds");
+ df.DataSource = entity => Role.FindAllWithCache().Where(e => TenantId == 0 ? true : RoleIds?.Contains(e.ID) ?? false).OrderByDescending(e => e.Sort).ToDictionary(e => e.ID, e => e.Name);
+ }
+ {
+ var df = EditFormFields.GetField("RoleId");
+ df.DataSource = entity => Role.FindAllWithCache().Where(e => TenantId == 0 ? true : RoleIds?.Contains(e.ID) ?? false).OrderByDescending(e => e.Sort).ToDictionary(e => e.ID, e => e.Name);
+ }
  }
 
  /// <summary>搜索数据集</summary>