【修改】PC端-我的桌面、移动端-首页：通知公告、家校互访的显示；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs

@@ -193,8 +193,17 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
             {
                 dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("@@@userId", "'" + loginUserInfo.userId + "'");
             }
+            //增加通知公告类的已读标志
+            if (dtListEntity.F_Url.Contains("/Notice/ViewIndex"))
+            {
+                dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("@userId", "'" + loginUserInfo.userId + "'");
+            }
+
             var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql);
-            if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587")
+            //通知公告、家校互动、模块增加接收岗位、接收部门的限制；
+            //通知公告（88f94781-acb8-47ca-864b-f96e3d9b5587）
+            //家校互动（a030b590-34e1-4adc-8ab2-476d4c53976b）
+            if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587" || dtListEntity.F_Id== "a030b590-34e1-4adc-8ab2-476d4c53976b")
             {
                 dtnew = reqDataTable.Clone();
                 for (int i = 0; i < reqDataTable.Rows.Count; i++)
@@ -232,10 +241,13 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
                     {
                         if (reqDataTable.Rows[i]["F_SendDeptId"] != null && reqDataTable.Rows[i]["F_SendDeptId"].ToString() != "")
                         {
-                            if (reqDataTable.Rows[i]["F_SendDeptId"].ToString().Contains(loginUserInfo.departmentId))
+                            if (!string.IsNullOrEmpty(loginUserInfo.departmentId))
                             {
-                                if (dtnew.Rows.Count < 5)
-                                    dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                if (reqDataTable.Rows[i]["F_SendDeptId"].ToString().Contains(loginUserInfo.departmentId))
+                                {
+                                    if (dtnew.Rows.Count < 5)
+                                        dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                }
                             }
                         }
                         else

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/DesktopApi.cs

@@ -110,9 +110,17 @@ namespace Learun.Application.WebApi.Modules
                         dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("MMM", strSql.ToString());
                     }
 
+                    //增加通知公告类的已读标志
+                    if (dtListEntity.F_Url.Contains("/Notice/ViewIndex"))
+                    {
+                        dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("@userId", "'" + loginUserInfo.userId + "'");
+                    }
 
                     var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql);
-                    if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587")
+                    //通知公告、家校互动、模块增加接收岗位、接收部门的限制；
+                    //通知公告（88f94781-acb8-47ca-864b-f96e3d9b5587）
+                    //家校互动（a030b590-34e1-4adc-8ab2-476d4c53976b）
+                    if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587" || dtListEntity.F_Id == "a030b590-34e1-4adc-8ab2-476d4c53976b")
                     {
                         dtnew = reqDataTable.Clone();
                         for (int i = 0; i < reqDataTable.Rows.Count; i++)
@@ -127,8 +135,11 @@ namespace Learun.Application.WebApi.Modules
                                         {
                                             if (reqDataTable.Rows[i]["F_SendPostId"].ToString().Contains(postid))
                                             {
-                                                dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
-                                                break;
+                                                if (dtnew.Rows.Count < 5)
+                                                {
+                                                    dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                                    break;
+                                                }
                                             }
                                         }
                                     }
@@ -136,7 +147,8 @@ namespace Learun.Application.WebApi.Modules
                                     {
                                         if (reqDataTable.Rows[i]["F_SendPostId"].ToString().Contains(loginUserInfo.postIds))
                                         {
-                                            dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                            if (dtnew.Rows.Count < 5)
+                                                dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
                                         }
                                     }
                                 }
@@ -145,14 +157,19 @@ namespace Learun.Application.WebApi.Modules
                             {
                                 if (reqDataTable.Rows[i]["F_SendDeptId"] != null && reqDataTable.Rows[i]["F_SendDeptId"].ToString() != "")
                                 {
-                                    if (reqDataTable.Rows[i]["F_SendDeptId"].ToString().Contains(loginUserInfo.departmentId))
+                                    if (!string.IsNullOrEmpty(loginUserInfo.departmentId))
                                     {
-                                        dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                        if (reqDataTable.Rows[i]["F_SendDeptId"].ToString().Contains(loginUserInfo.departmentId))
+                                        {
+                                            if (dtnew.Rows.Count < 5)
+                                                dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                        }
                                     }
                                 }
                                 else
                                 {
-                                    dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
+                                    if (dtnew.Rows.Count < 5)
+                                        dtnew.Rows.Add(reqDataTable.Rows[i].ItemArray);
                                 }
                             }
 
@@ -211,7 +228,7 @@ namespace Learun.Application.WebApi.Modules
                         }
                     }
                 }
-                return Success(data.Select(m=>m.DistributedUrl));
+                return Success(data.Select(m => m.DistributedUrl));
             }
         }