Procházet zdrojové kódy

😒去掉实体导航字段多余的特性

zuohuaijun před 2 roky
rodič
revize
da5033fc6c

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -25,7 +25,6 @@ public class SysDictData : EntityBase
     /// <summary>
     /// 字典类型
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(DictTypeId))]
     public SysDictType DictType { get; set; }
 

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysNoticeUser.cs

@@ -25,7 +25,6 @@ public class SysNoticeUser
     /// <summary>
     /// 通知公告
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(NoticeId))]
     public SysNotice SysNotice { get; set; }
 

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysRoleMenu.cs

@@ -31,7 +31,6 @@ public class SysRoleMenu : EntityBaseId
     /// <summary>
     /// 菜单
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(MenuId))]
     public SysMenu SysMenu { get; set; }
 }

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysRoleOrg.cs

@@ -31,7 +31,6 @@ public class SysRoleOrg : EntityBaseId
     /// <summary>
     /// 机构
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(OrgId))]
     public SysOrg SysOrg { get; set; }
 }

+ 0 - 2
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -201,7 +201,6 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 机构
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(OrgId))]
     public SysOrg SysOrg { get; set; }
 
@@ -214,7 +213,6 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 职位
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(PosId))]
     public SysPos SysPos { get; set; }
 

+ 6 - 2
Admin.NET/Admin.NET.Core/Entity/SysUserExtOrg.cs

@@ -22,6 +22,12 @@ public class SysUserExtOrg : EntityBaseId
     [SugarColumn(ColumnDescription = "用户Id")]
     public long UserId { get; set; }
 
+    /// <summary>
+    /// 用户
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(UserId))]
+    public SysUser SysUser { get; set; }
+
     /// <summary>
     /// 机构Id
     /// </summary>
@@ -31,7 +37,6 @@ public class SysUserExtOrg : EntityBaseId
     /// <summary>
     /// 机构
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(OrgId))]
     public SysOrg SysOrg { get; set; }
 
@@ -44,7 +49,6 @@ public class SysUserExtOrg : EntityBaseId
     /// <summary>
     /// 职位
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(PosId))]
     public SysPos SysPos { get; set; }
 

+ 6 - 1
Admin.NET/Admin.NET.Core/Entity/SysUserRole.cs

@@ -22,6 +22,12 @@ public class SysUserRole : EntityBaseId
     [SugarColumn(ColumnDescription = "用户Id")]
     public long UserId { get; set; }
 
+    /// <summary>
+    /// 用户
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(UserId))]
+    public SysUser SysUser { get; set; }
+
     /// <summary>
     /// 角色Id
     /// </summary>
@@ -31,7 +37,6 @@ public class SysUserRole : EntityBaseId
     /// <summary>
     /// 角色
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(RoleId))]
     public SysRole SysRole { get; set; }
 }

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs

@@ -143,7 +143,6 @@ public class SysWechatPay : EntityBase
     /// <summary>
     /// 关联微信用户
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(OpenId))]
     public SysWechatUser SysWechatUser { get; set; }
 

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysWechatUser.cs

@@ -25,7 +25,6 @@ public class SysWechatUser : EntityBase
     /// <summary>
     /// 系统用户
     /// </summary>
-    [SugarColumn(IsIgnore = true)]
     [Navigate(NavigateType.OneToOne, nameof(UserId))]
     public SysUser SysUser { get; set; }
 

+ 0 - 1
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs

@@ -45,7 +45,6 @@ public class GoViewPro : EntityTenant
     ///// <summary>
     ///// 项目数据
     ///// </summary>
-    //[SugarColumn(IsIgnore = true)]
     //[Navigate(NavigateType.OneToOne, nameof(Id))]
     //public GoViewProData GoViewProData { get; set; }
 }