1
This commit is contained in:
parent
825a183818
commit
248b950dff
@ -696,6 +696,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
item.Nav_Posts = libPosts.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
|
item.Nav_Posts = libPosts.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
|
||||||
}
|
}
|
||||||
result.Data = lib;
|
result.Data = lib;
|
||||||
|
result.TotalCount = lib.Count();
|
||||||
}
|
}
|
||||||
if (result != null && result.Data != null)
|
if (result != null && result.Data != null)
|
||||||
{
|
{
|
||||||
@ -786,7 +787,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
var temp2 = i + "、" + string.Join(",", departTempNames) + Environment.NewLine;
|
var temp2 = i + "、" + string.Join(",", departTempNames) + Environment.NewLine;
|
||||||
item.CHECKDEPT = item.CHECKDEPT + temp2;
|
item.CHECKDEPT = item.CHECKDEPT + temp2;
|
||||||
var departTempIds = departTemps.Select(t => t.ID).ToList();
|
var departTempIds = departTemps.Select(t => t.ID).ToList();
|
||||||
var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
|
var postTempIds = users.Where(t => t.DEPARTMENT_ID!=null && departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person?.POST_ID).Distinct().ToList();
|
||||||
var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
|
var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
|
||||||
var temp3 = i + "、" + string.Join(",", postTemps) + Environment.NewLine;
|
var temp3 = i + "、" + string.Join(",", postTemps) + Environment.NewLine;
|
||||||
item.CHECKPOST = item.CHECKPOST + temp3;
|
item.CHECKPOST = item.CHECKPOST + temp3;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user