|
|
@@ -155,48 +155,8 @@ namespace Learun.Application.Web.Controllers |
|
|
|
ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); |
|
|
|
//公告 |
|
|
|
List<NewsEntity> outnewslist = new List<NewsEntity>(); |
|
|
|
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<NewsEntity>(); |
|
|
|
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<NewsEntity>(); |
|
|
|
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<NewsEntity>(); |
|
|
|
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<NewsEntity> outnewslist = new List<NewsEntity>(); |
|
|
|
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<NewsEntity> outnewslist = new List<NewsEntity>(); |
|
|
|
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); |
|
|
|
//宣传报道 |
|
|
|