Просмотр исходного кода

😁防止实体整体输出时多余序列化

zuohuaijun 2 лет назад
Родитель
Сommit
1ac12f46cc

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

@@ -25,6 +25,8 @@ public class SysDictData : EntityBase
     /// <summary>
     /// 字典类型
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(DictTypeId))]
     public SysDictType DictType { get; set; }
 

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

@@ -52,6 +52,8 @@ public class SysDictType : EntityBase
     /// <summary>
     /// 字典值集合
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToMany, nameof(SysDictData.DictTypeId))]
     public List<SysDictData> Children { get; set; }
 }

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

@@ -25,6 +25,8 @@ public class SysNoticeUser : EntityBaseId
     /// <summary>
     /// 通知公告
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(NoticeId))]
     public SysNotice SysNotice { get; set; }
 

+ 4 - 0
Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs

@@ -39,6 +39,8 @@ public class SysOpenAccess : EntityBase
     /// <summary>
     /// 绑定租户
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(BindTenantId))]
     public SysTenant BindTenant { get; set; }
 
@@ -51,6 +53,8 @@ public class SysOpenAccess : EntityBase
     /// <summary>
     /// 绑定用户
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(BindUserId))]
     public SysUser BindUser { get; set; }
 }

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

@@ -58,6 +58,8 @@ public class SysOrg : EntityTenant
     /// <summary>
     /// 负责人
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(DirectorId))]
     public SysUser Director { get; set; }
 

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

@@ -31,6 +31,8 @@ public class SysRoleMenu : EntityBaseId
     /// <summary>
     /// 菜单
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(MenuId))]
     public SysMenu SysMenu { get; set; }
 }

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

@@ -31,6 +31,8 @@ public class SysRoleOrg : EntityBaseId
     /// <summary>
     /// 机构
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(OrgId))]
     public SysOrg SysOrg { get; set; }
 }

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

@@ -201,6 +201,8 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 直属机构
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(OrgId))]
     public SysOrg SysOrg { get; set; }
 
@@ -213,6 +215,8 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 直属主管
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(ManagerUserId))]
     public SysUser ManagerUser { get; set; }
 
@@ -225,6 +229,8 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 职位
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(PosId))]
     public SysPos SysPos { get; set; }
 

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

@@ -25,6 +25,8 @@ public class SysUserExtOrg : EntityBaseId
     /// <summary>
     /// 用户
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(UserId))]
     public SysUser SysUser { get; set; }
 
@@ -37,6 +39,8 @@ public class SysUserExtOrg : EntityBaseId
     /// <summary>
     /// 机构
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(OrgId))]
     public SysOrg SysOrg { get; set; }
 
@@ -49,6 +53,8 @@ public class SysUserExtOrg : EntityBaseId
     /// <summary>
     /// 职位
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(PosId))]
     public SysPos SysPos { get; set; }
 

+ 4 - 0
Admin.NET/Admin.NET.Core/Entity/SysUserRole.cs

@@ -25,6 +25,8 @@ public class SysUserRole : EntityBaseId
     /// <summary>
     /// 用户
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(UserId))]
     public SysUser SysUser { get; set; }
 
@@ -37,6 +39,8 @@ public class SysUserRole : EntityBaseId
     /// <summary>
     /// 角色
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(RoleId))]
     public SysRole SysRole { get; set; }
 }

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

@@ -143,6 +143,8 @@ public class SysWechatPay : EntityBase
     /// <summary>
     /// 关联微信用户
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(OpenId))]
     public SysWechatUser SysWechatUser { get; set; }
 

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

@@ -25,6 +25,8 @@ public class SysWechatUser : EntityBase
     /// <summary>
     /// 系统用户
     /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
     [Navigate(NavigateType.OneToOne, nameof(UserId))]
     public SysUser SysUser { get; set; }
 

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

@@ -45,6 +45,8 @@ public class GoViewPro : EntityTenant
     ///// <summary>
     ///// 项目数据
     ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
     //[Navigate(NavigateType.OneToOne, nameof(Id))]
     //public GoViewProData GoViewProData { get; set; }
 }