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

update 区域管理名称修改等

Browse Source
This commit is contained in:
ky_yusj
2021-04-29 18:21:13 +08:00
parent 5f7dae2380
commit 98c992bc89
26 changed files with 388 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Api/Ewide.Core/Entity/AreaNumber.cs → Api/Ewide.Core/Entity/SysAreaCode.cs
View File

@@ -8,26 +8,27 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Ewide.Core.Entity
namespace Ewide.Core
{
[Table("ewide_area_number")]
[Table("sys_area_code")]
[Comment("区域表")]
public class AreaNumber: IEntity
public class SysAreaCode: IEntity
{
[Key]
[Comment("系统使用的区域代码")]
[MaxLength(10)]
[MaxLength(50)]
public string Code { get; set; }
[Comment("对外使用的区域代码")]
[MaxLength(10)]
[MaxLength(50)]
public string ShowCode { get; set; }
[Comment("名称")]
[Required]
[MaxLength(10)]
[MaxLength(100)]
public string Name { get; set; }
[Comment("备注")]
[MaxLength(1000)]
public string Note { get; set; }
[Comment("类别")]

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

@@ -1,5 +1,4 @@
using Ewide.Core.Entity;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
@@ -73,7 +72,7 @@ namespace Ewide.Core
/// <summary>
/// 一对一 一个组织对应一个区域代码
/// </summary>
public AreaNumber AreaNumber { get; set; }
public SysAreaCode AreaCode { get; set; }
/// <summary>
/// 多对多（用户）

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

@@ -1,5 +1,4 @@
using Ewide.Core.Entity;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using System;
@@ -71,7 +70,7 @@ namespace Ewide.Core
/// </summary>
public List<SysRoleDataScope> SysRoleDataScopes { get; set; }
public ICollection<AreaNumber> AreaNumbers { get; set; }
public ICollection<SysAreaCode> AreaCodes { get; set; }
public List<SysRoleArea> SysRoleAreas { get; set; }
@@ -102,10 +101,10 @@ namespace Ewide.Core
{
u.HasKey(c => new { c.SysRoleId, c.SysOrgId });
});
entityBuilder.HasMany(p => p.AreaNumbers)
entityBuilder.HasMany(p => p.AreaCodes)
.WithMany(p => p.SysRoles)
.UsingEntity<SysRoleArea>(
u => u.HasOne(c => c.AreaNumber).WithMany(c => c.SysRoleAreas).HasForeignKey(c => c.AreaNumberCode),
u => u.HasOne(c => c.AreaCode).WithMany(c => c.SysRoleAreas).HasForeignKey(c => c.AreaNumberCode),
u => u.HasOne(c => c.SysRole).WithMany(c => c.SysRoleAreas).HasForeignKey(c => c.SysRoleId),
u =>
{

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

@@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Ewide.Core.Entity
namespace Ewide.Core
{
[Table("sys_role_area")]
[Comment("角色区域自定义数据")]
@@ -24,7 +24,7 @@ namespace Ewide.Core.Entity
[Comment("系统使用的区域代码")]
[MaxLength(10)]
public string AreaNumberCode { get; set; }
public AreaNumber AreaNumber { get; set; }
public SysAreaCode AreaCode { get; set; }
}
}

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

@@ -1,5 +1,4 @@
using Ewide.Core.Entity;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using System;
@@ -128,7 +127,7 @@ namespace Ewide.Core
/// </summary>
public List<SysUserDataScope> SysUserDataScopes { get; set; }
public ICollection<AreaNumber> AreaNumbers { get; set; }
public ICollection<SysAreaCode> AreaCodes { get; set; }
/// <summary>
/// 多对多中间表（用户-区域 数据范围）
/// </summary>
@@ -156,8 +155,8 @@ namespace Ewide.Core
{
u.HasKey(c => new { c.SysUserId, c.SysOrgId });
});
entityBuilder.HasMany(p => p.AreaNumbers).WithMany(p => p.SysUsers).UsingEntity<SysUserArea>(
u => u.HasOne(c => c.AreaNumber).WithMany(c => c.SysUserAreas).HasForeignKey(c => c.AreaNumberCode),
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.SysUser).WithMany(c => c.SysUserAreas).HasForeignKey(c => c.SysUserId),
u =>
{

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

@@ -1,14 +1,9 @@
using Furion.DatabaseAccessor;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Ewide.Core.Entity
namespace Ewide.Core
{
[Table("sys_user_area")]
[Comment("用户授权区域信息")]
@@ -24,6 +19,6 @@ namespace Ewide.Core.Entity
[Comment("系统使用的区域代码")]
[MaxLength(10)]
public string AreaNumberCode { get; set; }
public AreaNumber AreaNumber { get; set; }
public SysAreaCode AreaCode { get; set; }
}
}