From 0e2e717836b2740fa0c6ebaa1e305bf56ca8b0e1 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 30 Nov 2023 15:03:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=BD=91?= =?UTF-8?q?=E4=B8=8A=E5=8A=9E=E4=BA=8B=E5=A4=A7=E5=8E=85=EF=BC=9A=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SSOSystemController.cs | 264 +----------------- 1 file changed, 12 insertions(+), 252 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index 414447cd0..ef5fbb8c7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -155,48 +155,8 @@ namespace Learun.Application.Web.Controllers ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); //公告 List outnewslist = new List(); - var newsList = newsIBLL.GetList("", userInfo.userId); - foreach (var newsitemEntity in newsList) - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) - { - if (!string.IsNullOrEmpty(userInfo.postIds)) - { - if (userInfo.postIds.Contains(",")) - { - foreach (var postid in userInfo.postIds.Split(',')) - { - if (newsitemEntity.F_SendPostId.Contains(postid)) - { - outnewslist.Add(newsitemEntity); - break; - } - } - } - else - { - if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) - { - outnewslist.Add(newsitemEntity); - } - } - } - } - else - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) - { - if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) - { - outnewslist.Add(newsitemEntity); - } - } - else - { - outnewslist.Add(newsitemEntity); - } - } - } + var newsList = newsIBLL.GetList(""); + outnewslist.AddRange(newsList); ViewBag.NewsList = outnewslist.Take(5); ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); //宣传报道 @@ -504,50 +464,10 @@ namespace Learun.Application.Web.Controllers //公告 Pagination paginationobj = new Pagination() { rows = 10, page = page, sidx = "F_CreateDate", sord = "desc" }; paginationobj.rows = 100; - var newsList = newsIBLL.GetList("", userinfo.userId); + var newsList = newsIBLL.GetList(""); //用户可以看到的通知公告 var newsListSelf = new List(); - foreach (var newsitemEntity in newsList) - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) - { - if (!string.IsNullOrEmpty(userinfo.postIds)) - { - if (userinfo.postIds.Contains(",")) - { - foreach (var postid in userinfo.postIds.Split(',')) - { - if (newsitemEntity.F_SendPostId.Contains(postid)) - { - newsListSelf.Add(newsitemEntity); - break; - } - } - } - else - { - if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds)) - { - newsListSelf.Add(newsitemEntity); - } - } - } - } - else - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) - { - if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId)) - { - newsListSelf.Add(newsitemEntity); - } - } - else - { - newsListSelf.Add(newsitemEntity); - } - } - } + newsListSelf.AddRange(newsList); foreach (var ufitem in newsListSelf) { @@ -592,50 +512,10 @@ namespace Learun.Application.Web.Controllers } //公告 Pagination paginationobj = new Pagination() { rows = 10, page = page, sidx = "F_CreateDate", sord = "desc" }; - var newsList = newsIBLL.GetList("", userinfo.userId); + var newsList = newsIBLL.GetList(""); //用户可以看到的通知公告 var newsListSelf = new List(); - foreach (var newsitemEntity in newsList) - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) - { - if (!string.IsNullOrEmpty(userinfo.postIds)) - { - if (userinfo.postIds.Contains(",")) - { - foreach (var postid in userinfo.postIds.Split(',')) - { - if (newsitemEntity.F_SendPostId.Contains(postid)) - { - newsListSelf.Add(newsitemEntity); - break; - } - } - } - else - { - if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds)) - { - newsListSelf.Add(newsitemEntity); - } - } - } - } - else - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) - { - if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId)) - { - newsListSelf.Add(newsitemEntity); - } - } - else - { - newsListSelf.Add(newsitemEntity); - } - } - } + newsListSelf.AddRange(newsList); foreach (var ufitem in newsListSelf) { @@ -734,50 +614,10 @@ namespace Learun.Application.Web.Controllers } //公告 Pagination paginationobj = new Pagination() { rows = 10, page = page, sidx = "F_CreateDate", sord = "desc" }; - var newsList = newsIBLL.GetList("", userinfo.userId); + var newsList = newsIBLL.GetList(""); //用户可以看到的通知公告 var newsListSelf = new List(); - foreach (var newsitemEntity in newsList) - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) - { - if (!string.IsNullOrEmpty(userinfo.postIds)) - { - if (userinfo.postIds.Contains(",")) - { - foreach (var postid in userinfo.postIds.Split(',')) - { - if (newsitemEntity.F_SendPostId.Contains(postid)) - { - newsListSelf.Add(newsitemEntity); - break; - } - } - } - else - { - if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds)) - { - newsListSelf.Add(newsitemEntity); - } - } - } - } - else - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) - { - if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId)) - { - newsListSelf.Add(newsitemEntity); - } - } - else - { - newsListSelf.Add(newsitemEntity); - } - } - } + newsListSelf.AddRange(newsList); foreach (var ufitem in newsListSelf) { @@ -1155,48 +995,8 @@ namespace Learun.Application.Web.Controllers ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); //公告 List outnewslist = new List(); - var newsList = newsIBLL.GetList("", userInfo.userId); - foreach (var newsitemEntity in newsList) - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) - { - if (!string.IsNullOrEmpty(userInfo.postIds)) - { - if (userInfo.postIds.Contains(",")) - { - foreach (var postid in userInfo.postIds.Split(',')) - { - if (newsitemEntity.F_SendPostId.Contains(postid)) - { - outnewslist.Add(newsitemEntity); - break; - } - } - } - else - { - if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) - { - outnewslist.Add(newsitemEntity); - } - } - } - } - else - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) - { - if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) - { - outnewslist.Add(newsitemEntity); - } - } - else - { - outnewslist.Add(newsitemEntity); - } - } - } + var newsList = newsIBLL.GetList(""); + outnewslist.AddRange(newsList); ViewBag.NewsList = outnewslist.Take(5); ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); //宣传报道 @@ -1476,48 +1276,8 @@ namespace Learun.Application.Web.Controllers ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); //公告 List outnewslist = new List(); - var newsList = newsIBLL.GetList("", userInfo.userId); - foreach (var newsitemEntity in newsList) - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) - { - if (!string.IsNullOrEmpty(userInfo.postIds)) - { - if (userInfo.postIds.Contains(",")) - { - foreach (var postid in userInfo.postIds.Split(',')) - { - if (newsitemEntity.F_SendPostId.Contains(postid)) - { - outnewslist.Add(newsitemEntity); - break; - } - } - } - else - { - if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) - { - outnewslist.Add(newsitemEntity); - } - } - } - } - else - { - if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) - { - if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) - { - outnewslist.Add(newsitemEntity); - } - } - else - { - outnewslist.Add(newsitemEntity); - } - } - } + var newsList = newsIBLL.GetList(""); + outnewslist.AddRange(newsList); ViewBag.NewsList = outnewslist.Take(5); ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); //宣传报道