优化
This commit is contained in:
parent
ecd013d264
commit
863b32265a
@ -6057,7 +6057,7 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
var libDetailIds = libraryDetails.Select(t => t.ID).ToList();
|
var libDetailIds = libraryDetails.Select(t => t.ID).ToList();
|
||||||
//检查内容
|
//检查内容
|
||||||
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED && libDetailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
|
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED && libDetailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
|
||||||
var libContentIds = libraryDetails.Select(t => t.ID).ToList();
|
var libContentIds = contents.Select(t => t.ID).ToList();
|
||||||
//检查层级
|
//检查层级
|
||||||
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED && libContentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
|
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED && libContentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
|
||||||
var conDepartIds = contentDeparts.Select(t => t.ID).ToList();
|
var conDepartIds = contentDeparts.Select(t => t.ID).ToList();
|
||||||
@ -6217,9 +6217,19 @@ namespace APT.PP.WebApi.Controllers.Api
|
|||||||
List<CheckListUser> listUser = new List<CheckListUser>();
|
List<CheckListUser> listUser = new List<CheckListUser>();
|
||||||
foreach (var tem in depatUserIdList)
|
foreach (var tem in depatUserIdList)
|
||||||
{
|
{
|
||||||
CheckListUser user = new CheckListUser();
|
var temList= tem.Split(",").ToList();
|
||||||
user.USER_ID = Guid.Parse(tem);
|
if (temList.Any())
|
||||||
listUser.Add(user);
|
{
|
||||||
|
foreach (var tem2 in temList)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(tem2))
|
||||||
|
{
|
||||||
|
CheckListUser user = new CheckListUser();
|
||||||
|
user.USER_ID = Guid.Parse(tem);
|
||||||
|
listUser.Add(user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
listNew.users = listUser.Distinct(m => m.USER_ID).ToList();
|
listNew.users = listUser.Distinct(m => m.USER_ID).ToList();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user