diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs index 731f371b8..3f1755cf0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs @@ -297,19 +297,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers break; } } - var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).GroupBy(o => o.F_CreateUserName).Select(o => new + var newlist = firstList.Where(x => x.F_NodeName != "传阅落实" && firstList.Select(mo => mo.F_CreateDate).Contains(x.F_CreateDate)).OrderBy(s => s.F_CreateDate).ToList(); + for (int i = 1; i < newlist.Count; i++) { - F_CreateDate = o.FirstOrDefault().F_CreateDate, - F_CreateUserName = o.FirstOrDefault().F_CreateUserName, - }); - var newList = PrintList.Where(s => PrintList.Select(mo => mo.F_CreateDate).Contains(s.F_CreateDate)).OrderBy(s => s.F_CreateDate).ToList(); - for (int i = 1; i < newList.Count; i++) - { - if (i != 1 && i != newList.Count) + if (i != 1) { - if (!ViewBag.pSList.Contains(newList[i].F_CreateUserName)) + if (!ViewBag.pSList.Contains(newlist[i].F_CreateUserName)) { - ViewBag.pSList += newList[i].F_CreateUserName + newList[i].F_CreateDate + "阅" + "&"; + ViewBag.pSList += newlist[i].F_CreateUserName + newlist[i].F_CreateDate + "阅" + "&"; } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config index 769eae647..180c9b22d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config @@ -1,7 +1,7 @@  - - + +