This commit is contained in:
何美荣 2026-05-06 15:20:33 +08:00
parent ecd013d264
commit 863b32265a

View File

@ -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();
@ -6216,11 +6216,21 @@ 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)
{
var temList= tem.Split(",").ToList();
if (temList.Any())
{
foreach (var tem2 in temList)
{
if (!string.IsNullOrEmpty(tem2))
{ {
CheckListUser user = new CheckListUser(); CheckListUser user = new CheckListUser();
user.USER_ID = Guid.Parse(tem); user.USER_ID = Guid.Parse(tem);
listUser.Add(user); listUser.Add(user);
} }
}
}
}
listNew.users = listUser.Distinct(m => m.USER_ID).ToList(); listNew.users = listUser.Distinct(m => m.USER_ID).ToList();
} }
list.Add(listNew); list.Add(listNew);