wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
system/Tnb.Systems/Permission/OrganizeAdministratorService.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Contracts;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
@@ -78,7 +77,8 @@ public class OrganizeAdministratorService : IOrganizeAdministratorService, IDyna
List<string>? orgIds = dataScope.Where(x => x.ThisLayerSelect.Equals(1)).Select(x => x.OrganizeId).ToList();
if (dataScope.Any(x => x.SubLayerSelect.Equals(1)))
{
dataScope.Where(x => x.SubLayerSelect.Equals(1)).ToList().ForEach(item => {
dataScope.Where(x => x.SubLayerSelect.Equals(1)).ToList().ForEach(item =>
{
var resList = _repository.AsSugarClient().Queryable<OrganizeEntity>().Where(o => !o.Id.Equals(item.OrganizeId) && o.OrganizeIdTree.Contains(item.OrganizeId) && o.DeleteMark == null && o.EnabledMark == 1).Select(x => x.Id).ToList();
orgIds.AddRange(resList);
});
@@ -352,7 +352,7 @@ public class OrganizeAdministratorService : IOrganizeAdministratorService, IDyna
resultItem.organizeIdTree = orgItem.OrganizeIdTree;
if (userItem.ThisLayerAdd.Equals(0)) resultItem.thisLayerAdd = -1;
else if(userItem.ThisLayerAdd.Equals(1)) resultItem.thisLayerAdd = 2;
else if (userItem.ThisLayerAdd.Equals(1)) resultItem.thisLayerAdd = 2;
else if (userItem.ThisLayerAdd.Equals(3) || userItem.ThisLayerAdd.Equals(1)) resultItem.thisLayerAdd = 3;
if (userItem.ThisLayerEdit.Equals(0)) resultItem.thisLayerEdit = -1;
@@ -504,7 +504,7 @@ public class OrganizeAdministratorService : IOrganizeAdministratorService, IDyna
[UnitOfWork]
public async Task Save([FromBody] OrganizeAdminIsTratorUpInput input)
{
if(input.userId.Equals(_userManager.UserId)) throw Oops.Oh(ErrorCode.D2304);
if (input.userId.Equals(_userManager.UserId)) throw Oops.Oh(ErrorCode.D2304);
// 处理组织树 名称
List<OrganizeEntity> orgTreeNameList = GetOrgListTreeName();
@@ -552,7 +552,7 @@ public class OrganizeAdministratorService : IOrganizeAdministratorService, IDyna
});
// 管理员权限
var adminList= currList.Where(x => x.ThisLayerAdd.Equals(1) || x.ThisLayerEdit.Equals(1) || x.ThisLayerDelete.Equals(1) || x.ThisLayerSelect.Equals(1) ||
var adminList = currList.Where(x => x.ThisLayerAdd.Equals(1) || x.ThisLayerEdit.Equals(1) || x.ThisLayerDelete.Equals(1) || x.ThisLayerSelect.Equals(1) ||
x.SubLayerAdd.Equals(1) || x.SubLayerEdit.Equals(1) || x.SubLayerDelete.Equals(1) || x.SubLayerSelect.Equals(1)).Where(x => x.UserId.Equals(_userManager.UserId)).ToList().Copy();
adminList.Where(x => x.SubLayerAdd.Equals(1) || x.SubLayerEdit.Equals(1) || x.SubLayerDelete.Equals(1) || x.SubLayerSelect.Equals(1)).ToList().ForEach(item =>
{
@@ -733,7 +733,7 @@ public class OrganizeAdministratorService : IOrganizeAdministratorService, IDyna
/// <returns></returns>
private List<OrganizeAdministratorEntity> GetOrganizeAdministrators(List<OrganizeAdminCrInput> orgAdminList, string userId, List<OrganizeAdministratorEntity> oldList, List<OrganizeAdministratorEntity> adminList)
{
if(!_userManager.IsAdministrator)
if (!_userManager.IsAdministrator)
{
var addItems = new List<OrganizeAdminCrInput>();
orgAdminList.ForEach(item =>
@@ -768,7 +768,7 @@ public class OrganizeAdministratorService : IOrganizeAdministratorService, IDyna
});
oldList.ForEach(item =>
{
if(!orgAdminList.Any(x => x.organizeId.Equals(item.OrganizeId)) && !adminList.Any(x => x.OrganizeId.Equals(item.OrganizeId)))
if (!orgAdminList.Any(x => x.organizeId.Equals(item.OrganizeId)) && !adminList.Any(x => x.OrganizeId.Equals(item.OrganizeId)))
{
addItems.Add(new OrganizeAdminCrInput()
{