From 2cdf62eeb5aeb822cdba91d77ab6ecb46398874c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
<188633308@qq.com>
Date: Fri, 30 Apr 2021 10:53:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=A7=84=E8=8C=83=E5=8C=96=E6=89=80?=
=?UTF-8?q?=E6=9C=89=E5=8C=BA=E5=9F=9F=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Api/Ewide.Core/Entity/SysAreaCode.cs | 6 +++---
Api/Ewide.Core/Entity/SysOrg.cs | 7 ++++---
Api/Ewide.Core/Entity/SysRole.cs | 4 ++--
Api/Ewide.Core/Entity/SysRoleArea.cs | 6 ++----
Api/Ewide.Core/Entity/SysUser.cs | 4 ++--
Api/Ewide.Core/Entity/SysUserArea.cs | 4 ++--
Api/Ewide.Core/Ewide.Core.xml | 2 +-
Api/Ewide.Core/SeedData/SysAreaCodeData.cs | 6 +++---
Api/Ewide.Core/Service/Area/AreaCodeService.cs | 4 ++--
Api/Ewide.Core/Service/Org/SysOrgService.cs | 6 +++---
Api/Ewide.Core/Service/Role/SysRoleAreaService.cs | 6 +++---
Api/Ewide.Core/Service/User/SysUserAreaService.cs | 6 +++---
Api/Ewide.Core/Service/User/SysUserDataScopeService.cs | 6 +++---
13 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/Api/Ewide.Core/Entity/SysAreaCode.cs b/Api/Ewide.Core/Entity/SysAreaCode.cs
index 30c1dc8..f6eea58 100644
--- a/Api/Ewide.Core/Entity/SysAreaCode.cs
+++ b/Api/Ewide.Core/Entity/SysAreaCode.cs
@@ -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]
diff --git a/Api/Ewide.Core/Entity/SysOrg.cs b/Api/Ewide.Core/Entity/SysOrg.cs
index d9e5af6..5684c7f 100644
--- a/Api/Ewide.Core/Entity/SysOrg.cs
+++ b/Api/Ewide.Core/Entity/SysOrg.cs
@@ -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; }
+
///
/// 一对一 一个组织对应一个区域代码
///
- public SysAreaCode AreaCode { get; set; }
+ public SysAreaCode Area { get; set; }
///
/// 多对多（用户）
diff --git a/Api/Ewide.Core/Entity/SysRole.cs b/Api/Ewide.Core/Entity/SysRole.cs
index d9c029f..f8b0b0e 100644
--- a/Api/Ewide.Core/Entity/SysRole.cs
+++ b/Api/Ewide.Core/Entity/SysRole.cs
@@ -104,11 +104,11 @@ namespace Ewide.Core
entityBuilder.HasMany(p => p.AreaCodes)
.WithMany(p => p.SysRoles)
.UsingEntity(
- 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)
diff --git a/Api/Ewide.Core/Entity/SysRoleArea.cs b/Api/Ewide.Core/Entity/SysRoleArea.cs
index 78d74b5..71031b9 100644
--- a/Api/Ewide.Core/Entity/SysRoleArea.cs
+++ b/Api/Ewide.Core/Entity/SysRoleArea.cs
@@ -18,13 +18,11 @@ namespace Ewide.Core
/// 角色Id
///
[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; }
}
}
diff --git a/Api/Ewide.Core/Entity/SysUser.cs b/Api/Ewide.Core/Entity/SysUser.cs
index 6e2b4e0..384651d 100644
--- a/Api/Ewide.Core/Entity/SysUser.cs
+++ b/Api/Ewide.Core/Entity/SysUser.cs
@@ -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(
- 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 });
});
}
}
diff --git a/Api/Ewide.Core/Entity/SysUserArea.cs b/Api/Ewide.Core/Entity/SysUserArea.cs
index 58b9b38..181abb6 100644
--- a/Api/Ewide.Core/Entity/SysUserArea.cs
+++ b/Api/Ewide.Core/Entity/SysUserArea.cs
@@ -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; }
}
}
diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml
index e89ee2d..9d722bf 100644
--- a/Api/Ewide.Core/Ewide.Core.xml
+++ b/Api/Ewide.Core/Ewide.Core.xml
@@ -1353,7 +1353,7 @@
状态（字典 0正常 1停用 2删除）
-
+
一对一 一个组织对应一个区域代码
diff --git a/Api/Ewide.Core/SeedData/SysAreaCodeData.cs b/Api/Ewide.Core/SeedData/SysAreaCodeData.cs
index 21670fa..4ff61d7 100644
--- a/Api/Ewide.Core/SeedData/SysAreaCodeData.cs
+++ b/Api/Ewide.Core/SeedData/SysAreaCodeData.cs
@@ -14,9 +14,9 @@ namespace Ewide.Core
{
return new[]
{
- new SysAreaCode{Code="3302",ShowCode="3302",Name="XX市",Note="XX市",LevelType=1,Sort=0 },
- new SysAreaCode{Code="330266",ShowCode="330266",Name="测试区",Note="测试区",LevelType=2,Sort=100 },
- new SysAreaCode{Code="330266001",ShowCode="330266001",Name="测试街道",Note="测试街道",LevelType=3,Sort=0},
+ new SysAreaCode{Code="3302",AdCode="3302",Name="XX市",Note="XX市",LevelType=1,Sort=0 },
+ new SysAreaCode{Code="330266",AdCode="330266",Name="测试区",Note="测试区",LevelType=2,Sort=100 },
+ new SysAreaCode{Code="330266001",AdCode="330266001",Name="测试街道",Note="测试街道",LevelType=3,Sort=0},
};
}
}
diff --git a/Api/Ewide.Core/Service/Area/AreaCodeService.cs b/Api/Ewide.Core/Service/Area/AreaCodeService.cs
index 43a7e52..c717d65 100644
--- a/Api/Ewide.Core/Service/Area/AreaCodeService.cs
+++ b/Api/Ewide.Core/Service/Area/AreaCodeService.cs
@@ -43,7 +43,7 @@ namespace Ewide.Core.Service.Area
public async Task DeleteAreaCode(DeleteAreaCodeInput input)
{
var AreaCode = await _areaCodeRep.FirstOrDefaultAsync(p => p.Code == input.Code);
- if (await _sysOrgRep.DetachedEntities.AnyAsync(o => o.AreaNumberCode == input.Code))
+ if (await _sysOrgRep.DetachedEntities.AnyAsync(o => o.AreaCode == input.Code))
{
throw Oops.Oh("不能删除已包含区域的组织");
}
@@ -97,7 +97,7 @@ namespace Ewide.Core.Service.Area
var AreaCodes = await _areaCodeRep.DetachedEntities
.Where(input.LevelType.HasValue, a => a.LevelType == input.LevelType)
.Where(!string.IsNullOrEmpty(input.Code), a => a.Code.StartsWith(input.Code))
- .Where(!string.IsNullOrEmpty(input.ShowCode), a => a.ShowCode.StartsWith(input.ShowCode))
+ .Where(!string.IsNullOrEmpty(input.ShowCode), a => a.AdCode.StartsWith(input.ShowCode))
.Where(!string.IsNullOrEmpty(input.Name), a => a.Name.StartsWith(input.Name))
.ToPageData(input);
return XnPageResult.PageResult(AreaCodes);
diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs
index a340cf1..52acd89 100644
--- a/Api/Ewide.Core/Service/Org/SysOrgService.cs
+++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs
@@ -349,14 +349,14 @@ namespace Ewide.Core.Service
{
var org = await _sysOrgRep.FirstOrDefaultAsync(o => o.Id == orgId);
if (dataScopeType == (int)DataScopeType.AREA_WITH_CHILD)
- return await _sysOrgRep.DetachedEntities.Where(p => p.AreaNumberCode.StartsWith(org.Code)).Select(p => p.Id).ToListAsync();
+ return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(org.Code)).Select(p => p.Id).ToListAsync();
if (dataScopeType == (int)DataScopeType.AREA)
- return await _sysOrgRep.DetachedEntities.Where(p => p.AreaNumberCode == org.Code).Select(p => p.Id).ToListAsync();
+ return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == org.Code).Select(p => p.Id).ToListAsync();
return new List();
}
public async Task> GetAreaDataScopeIdListWithoutChildrenArea(string areaNumberCode)
{
- return await _sysOrgRep.DetachedEntities.Where(p => p.AreaNumberCode == areaNumberCode).Select(p => p.Id).ToListAsync();
+ return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == areaNumberCode).Select(p => p.Id).ToListAsync();
}
}
}
diff --git a/Api/Ewide.Core/Service/Role/SysRoleAreaService.cs b/Api/Ewide.Core/Service/Role/SysRoleAreaService.cs
index 6b030e1..112928e 100644
--- a/Api/Ewide.Core/Service/Role/SysRoleAreaService.cs
+++ b/Api/Ewide.Core/Service/Role/SysRoleAreaService.cs
@@ -21,7 +21,7 @@ namespace Ewide.Core.Service.Role
public async Task DeleteRoleAreaListByAreaCodeList(List areaCodeList)
{
- var dataScopes = await _sysRoleAreaRep.DetachedEntities.Where(u => areaCodeList.Contains(u.AreaNumberCode)).ToListAsync();
+ var dataScopes = await _sysRoleAreaRep.DetachedEntities.Where(u => areaCodeList.Contains(u.AreaCode)).ToListAsync();
dataScopes.ForEach(u =>
{
u.Delete();
@@ -39,7 +39,7 @@ namespace Ewide.Core.Service.Role
public async Task> GetRoleAreaCodeList(List roleIdList)
{
- return await _sysRoleAreaRep.DetachedEntities.Where(u => roleIdList.Contains(u.SysRoleId)).Select(u=>u.AreaNumberCode).Distinct().ToListAsync();
+ return await _sysRoleAreaRep.DetachedEntities.Where(u => roleIdList.Contains(u.SysRoleId)).Select(u=>u.AreaCode).Distinct().ToListAsync();
}
@@ -56,7 +56,7 @@ namespace Ewide.Core.Service.Role
new SysRoleArea
{
SysRoleId = input.Id,
- AreaNumberCode = u
+ AreaCode = u
}.Insert();
});
}
diff --git a/Api/Ewide.Core/Service/User/SysUserAreaService.cs b/Api/Ewide.Core/Service/User/SysUserAreaService.cs
index 1af6857..f1ff1a0 100644
--- a/Api/Ewide.Core/Service/User/SysUserAreaService.cs
+++ b/Api/Ewide.Core/Service/User/SysUserAreaService.cs
@@ -22,7 +22,7 @@ namespace Ewide.Core.Service.User
public async Task DeleteUserAreaListByAreaCodeList(List areaCodeList)
{
- var areaList = await _sysUserAreaRep.DetachedEntities.Where(ua => areaCodeList.Contains(ua.AreaNumberCode)).ToListAsync();
+ var areaList = await _sysUserAreaRep.DetachedEntities.Where(ua => areaCodeList.Contains(ua.AreaCode)).ToListAsync();
foreach (var area in areaList)
{
area.Delete();
@@ -40,7 +40,7 @@ namespace Ewide.Core.Service.User
public async Task> GetUserAreaIdList(string userId)
{
- return await _sysUserAreaRep.DetachedEntities.Where(ua => ua.SysUserId == userId).Select(ua => ua.AreaNumberCode).ToListAsync();
+ return await _sysUserAreaRep.DetachedEntities.Where(ua => ua.SysUserId == userId).Select(ua => ua.AreaCode).ToListAsync();
}
public async Task GrantData(UpdateUserInput input)
@@ -56,7 +56,7 @@ namespace Ewide.Core.Service.User
new SysUserArea
{
SysUserId = input.Id,
- AreaNumberCode = u
+ AreaCode = u
}.Insert();
});
}
diff --git a/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs b/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs
index 6d1c178..6028804 100644
--- a/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs
+++ b/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs
@@ -56,7 +56,7 @@ namespace Ewide.Core.Service
new SysUserArea
{
SysUserId = input.Id,
- AreaNumberCode = u
+ AreaCode = u
}.Insert();
});
@@ -70,12 +70,12 @@ namespace Ewide.Core.Service
///
public async Task> GetUserDataScopeIdList(string userId)
{
- var areaList = await _sysUserAreaRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.AreaNumberCode).ToListAsync();
+ var areaList = await _sysUserAreaRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.AreaCode).ToListAsync();
//用户自定义的区域权限所对应的全部组织机构id
List areaDataScopeIdList = new List();
foreach (var areaNumberCode in areaList)
{
- areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaNumberCode == areaNumberCode).Select(p => p.Id).ToListAsync());
+ areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == areaNumberCode).Select(p => p.Id).ToListAsync());
}
//用户自定义的组织权限
var orgIdList = await _sysUserDataScopeRep.DetachedEntities