ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 规范化所有区域相关字段

Browse Source
This commit is contained in:
自带大佬气场
2021-04-30 10:53:38 +08:00
parent 73001d5f8a
commit 2cdf62eeb5
13 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Api/Ewide.Core/Entity/SysAreaCode.cs
View File

@@ -15,12 +15,12 @@ namespace Ewide.Core
public class SysAreaCode: IEntity
{
[Key]
[Comment("系统使用的区域代码")]
[Comment("系统使用的区域编码")]
[MaxLength(50)]
public string Code { get; set; }
[Comment("对外使用的区域代码")]
[Comment("区域的行政编码")]
[MaxLength(50)]
public string ShowCode { get; set; }
public string AdCode { get; set; }
[Comment("名称")]
[Required]

7
Api/Ewide.Core/Entity/SysOrg.cs
View File

@@ -67,12 +67,13 @@ namespace Ewide.Core
[Comment("状态")]
public CommonStatus Status { get; set; } = CommonStatus.ENABLE;
[Comment("组织所在区域代码")]
public string AreaNumberCode { get; set; }
public string AreaCode { get; set; }
/// <summary>
/// 一对一 一个组织对应一个区域代码
/// </summary>
public SysAreaCode AreaCode { get; set; }
public SysAreaCode Area { get; set; }
/// <summary>
/// 多对多（用户）

4
Api/Ewide.Core/Entity/SysRole.cs
View File

@@ -104,11 +104,11 @@ namespace Ewide.Core
entityBuilder.HasMany(p => p.AreaCodes)
.WithMany(p => p.SysRoles)
.UsingEntity<SysRoleArea>(
u => u.HasOne(c => c.AreaCode).WithMany(c => c.SysRoleAreas).HasForeignKey(c => c.AreaNumberCode),
u => u.HasOne(c => c.Area).WithMany(c => c.SysRoleAreas).HasForeignKey(c => c.AreaCode),
u => u.HasOne(c => c.SysRole).WithMany(c => c.SysRoleAreas).HasForeignKey(c => c.SysRoleId),
u =>
{
u.HasKey(c => new { c.SysRoleId, c.AreaNumberCode });
u.HasKey(c => new { c.SysRoleId, c.AreaCode });
});
entityBuilder.HasMany(p => p.SysMenus)
.WithMany(p => p.SysRoles)

6
Api/Ewide.Core/Entity/SysRoleArea.cs
View File

@@ -18,13 +18,11 @@ namespace Ewide.Core
/// 角色Id
/// </summary>
[Comment("角色Id")]
[Column("SysRoleId", TypeName = "varchar(36)")]
public string SysRoleId { get; set; }
public SysRole SysRole { get; set; }
[Comment("系统使用的区域代码")]
[MaxLength(10)]
public string AreaNumberCode { get; set; }
public SysAreaCode AreaCode { get; set; }
public string AreaCode { get; set; }
public SysAreaCode Area { get; set; }
}
}

4
Api/Ewide.Core/Entity/SysUser.cs
View File

@@ -156,11 +156,11 @@ namespace Ewide.Core
u.HasKey(c => new { c.SysUserId, c.SysOrgId });
});
entityBuilder.HasMany(p => p.AreaCodes).WithMany(p => p.SysUsers).UsingEntity<SysUserArea>(
u => u.HasOne(c => c.AreaCode).WithMany(c => c.SysUserAreas).HasForeignKey(c => c.AreaNumberCode),
u => u.HasOne(c => c.Area).WithMany(c => c.SysUserAreas).HasForeignKey(c => c.AreaCode),
u => u.HasOne(c => c.SysUser).WithMany(c => c.SysUserAreas).HasForeignKey(c => c.SysUserId),
u =>
{
u.HasKey(c => new { c.SysUserId, c.AreaNumberCode });
u.HasKey(c => new { c.SysUserId, c.AreaCode });
});
}
}

4
Api/Ewide.Core/Entity/SysUserArea.cs
View File

@@ -18,7 +18,7 @@ namespace Ewide.Core
public SysUser SysUser { get; set; }
[Comment("系统使用的区域代码")]
[MaxLength(10)]
public string AreaNumberCode { get; set; }
public SysAreaCode AreaCode { get; set; }
public string AreaCode { get; set; }
public SysAreaCode Area { get; set; }
}
}