diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs index 8ba45ba..e92bac0 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs @@ -168,10 +168,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE allUserPostIdS.Add(current?.Nav_Person.POST_ID); } var testFilter = new BaseFilter(entity.ORG_ID); - testFilter.Include = new string[] { "Nav_Points", "Nav_Posts" }; + testFilter.Include = new string[] { "Nav_Points" };//, "Nav_Posts" - var allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) - && (st.Nav_Posts.Any(pt => allUserPostIdS.Contains(pt.POST_ID)) || !st.Nav_Posts.Any()), testFilter).ToList(); + var allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)), testFilter).ToList();// && (st.Nav_Posts.Any(pt => allUserPostIdS.Contains(pt.POST_ID)) || !st.Nav_Posts.Any()) var errorMsg = ""; foreach (var testPoint in pointIDS) { @@ -261,9 +260,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE private void CreateTestList(List allTests, List ret, List pointIDS, Guid? allUserPostIdS, int type, int count) { var tests = allTests.Where(t => t.TYPE == (SETestTypeEnum)type && - t.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && - (t.Nav_Posts.Any(pt => allUserPostIdS == pt.POST_ID) || !t.Nav_Posts.Any()) - ).OrderBy(t => Guid.NewGuid()).Take(count); + t.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value))).OrderBy(t => Guid.NewGuid()).Take(count);// &&(t.Nav_Posts.Any(pt => allUserPostIdS == pt.POST_ID) || !t.Nav_Posts.Any()) if (tests != null) { if (tests.Count() < count) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index 8ae7877..37a9a41 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -830,7 +830,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE var pointIDS = ListTrainContent.Select(t => t.POINT_ID).ToList(); var testFilter = new BaseFilter(record.ORG_ID); - testFilter.Include = new string[] { "Nav_Points", "Nav_Posts" };//岗位也得进去加以限制 + testFilter.Include = new string[] { "Nav_Points" };//, "Nav_Posts" 岗位也得进去加以限制 //根据 培训名称 全字 匹配 如果有题库 再判断 知识点 //如果没匹配到题目 只匹配知识点 @@ -841,11 +841,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE } LoginPostID = login.Nav_Person?.POST_ID; bool isNameRule = false; - var allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); + var allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)), testFilter).ToList();// && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)) if (allTests == null || allTests.Count() == 0) { isNameRule = true; - allTests = GetEntities(st => st.TRAINNAME == Notify.NAME && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); + allTests = GetEntities(st => st.TRAINNAME == Notify.NAME, testFilter).ToList();// && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)) } var errorMsg = ""; @@ -1048,7 +1048,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE } var pointIDS = record.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList(); var testFilter = new BaseFilter(filter.GetOrgId()); - testFilter.Include = new string[] { "Nav_Points", "Nav_Posts" };//岗位也得进去加以限制 + testFilter.Include = new string[] { "Nav_Points" };//, "Nav_Posts"岗位也得进去加以限制 //根据 培训名称 全字 匹配 如果有题库 再判断 知识点 //如果没匹配到题目 只匹配知识点 @@ -1062,11 +1062,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE // isNameRule = false; // allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); //} - var allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); + var allTests = GetEntities(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)), testFilter).ToList();//&& (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)) if (allTests == null || allTests.Count() == 0) { isNameRule = true; - allTests = GetEntities(st => st.TRAINNAME == record.Nav_Notify.NAME && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); + allTests = GetEntities(st => st.TRAINNAME == record.Nav_Notify.NAME, testFilter).ToList();//&& (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)) } var errorMsg = ""; diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs index cb7ee54..4a153e7 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs @@ -178,11 +178,11 @@ namespace APT.SE.WebApi.Controllers.Api if (item.Nav_Test != null) { if (item.Nav_Test.Nav_Points != null && item.Nav_Test.Nav_Points.Count > 0) - listTPost.AddRange(item.Nav_Test.Nav_Posts); + listTPoint.AddRange(item.Nav_Test.Nav_Points); // item.Nav_Test.Nav_Posts = null; //} if (item.Nav_Test.Nav_Posts != null && item.Nav_Test.Nav_Posts.Count > 0) - listTPoint.AddRange(item.Nav_Test.Nav_Points); + listTPost.AddRange(item.Nav_Test.Nav_Posts); // item.Nav_Test.Nav_Points = null; //} listT.Add(item.Nav_Test);