From 47527aa1d31a2aabb8034acc5fee8857abec202b Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 24 Aug 2022 18:15:03 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E6=A0=A1=E5=86=85=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/NewsApi.cs                        | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs
index ccf065c4c..d932ff6aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs	
@@ -98,38 +98,43 @@ namespace Learun.Application.WebApi.Modules
         {
             NoticeEntity parameter = this.GetReqData<NoticeEntity>();
             var shlist = noticeIBLL.GetEntityByProcessId(parameter.ProgressId);
-            //if (!shlist.F_SendDeptId.IsEmpty())
-            //{
-            var Array = shlist.F_SendPostId.Split(',');
-            var deept = departmentIBLL.GetAllList();
-            foreach (var item in Array)
+            if (!shlist.F_SendDeptId.IsEmpty())
             {
-                for (int i = 0; i < deept.Count; i++)
+                var Array = shlist.F_SendDeptId.Split(',');
+                var deept = departmentIBLL.GetAllList();
+                var SendDeptId = "";
+                foreach (var item in Array)
                 {
-                    if (item == deept[i].F_CompanyId)
+
+                    for (int i = 0; i < deept.Count; i++)
                     {
-                        shlist.F_SendDeptId += deept[i].F_FullName + ",";
+                        if (item == deept[i].F_DepartmentId)
+                        {
+                            SendDeptId += deept[i].F_FullName + ",";
+                        }
                     }
                 }
+                SendDeptId.Trim(',');
+                shlist.F_SendDeptId = SendDeptId;
             }
-            shlist.F_SendDeptId.Trim(',');
-            //}
-            //if (!shlist.F_SendDeptId.IsEmpty())
-            //{
-            var Array1 = shlist.F_SendPostId.Split(',');
-            var post = postIBLL.GetAllList();
-            foreach (var item in Array1)
+            if (!shlist.F_SendPostId.IsEmpty())
             {
-                for (int i = 0; i < post.Count; i++)
+                var Array1 = shlist.F_SendPostId.Split(',');
+                var post = postIBLL.GetAllList();
+                var F_SendPostId = "";
+                foreach (var item in Array1)
                 {
-                    if (item == post[i].F_CompanyId)
+                    for (int i = 0; i < post.Count; i++)
                     {
-                        shlist.F_SendDeptId += post[i].F_Name + ",";
+                        if (item == post[i].F_PostId)
+                        {
+                            F_SendPostId += post[i].F_Name + ",";
+                        }
                     }
                 }
+                F_SendPostId.Trim(',');
+                shlist.F_SendPostId = F_SendPostId;
             }
-            shlist.F_SendDeptId.Trim(',');
-            //}
             return Success(shlist);
         }
         #region 私有类