From 66e081bdc4e82ff6f21076762e56dd6dbf8e691c Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Mon, 5 Feb 2024 11:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=91=98=20=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/MTController/SCMTMeetingController.cs | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
index 2c9c6fe..18499a4 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
@@ -144,6 +144,25 @@ namespace APT.SC.WebApi.Controllers.Api.SC
                         }
                     }
 
+                    if (listUsers != null && listUsers.Any() && (listUsers[0].Nav_Department == null || listUsers[0].Nav_Person == null))
+                    {
+                        var listDepID = listUsers.Where(e => e.DEPARTMENT_ID.HasValue).Select(e => e.DEPARTMENT_ID.Value).Distinct();
+                        var listPersonID = listUsers.Where(e => e.PERSON_ID.HasValue).Select(e => e.PERSON_ID.Value).Distinct();
+
+                        if (listDepID.Any() && listPersonID.Any())
+                        {
+                            var listDep = GetEntities<T_FM_DEPARTMENT>(e => listDepID.Contains(e.ID), null);
+                            var listPer = GetEntities<T_FM_PERSON>(e => listPersonID.Contains(e.ID), null, "Nav_Post");
+                            foreach (var item in listUsers)
+                            {
+                                if (item.DEPARTMENT_ID.HasValue)
+                                    item.Nav_Department = listDep.FirstOrDefault(e => e.ID == item.DEPARTMENT_ID);
+                                if (item.PERSON_ID.HasValue)
+                                    item.Nav_Person = listPer.FirstOrDefault(e => e.ID == item.PERSON_ID);
+                            }
+                        }
+                    }
+
                     var MEETING_ID = new Guid(filter.Keyword);
                     for (int i = 0; i < listUsers.Count; i++)
                     {
@@ -210,6 +229,10 @@ namespace APT.SC.WebApi.Controllers.Api.SC
         {
             return SafeExecute<bool>(() =>
             {
+                if (entity.DEPARTMENT_ID == Guid.Empty)
+                {
+                    throw new Exception("会议部门不能为空或者超级管理员不能发布会议！");
+                }
                 Guid LoginID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
                 if (entity.USER_ID_ORIGINATOR != Guid.Empty && entity.USER_ID_ORIGINATOR != LoginID)
                 {
@@ -224,7 +247,6 @@ namespace APT.SC.WebApi.Controllers.Api.SC
                 {
                     throw new Exception("请选择会议类型！");
                 }
-
                 if (entity.Nav_Department == null)
                 {
                     entity.Nav_Department = GetEntity<T_FM_DEPARTMENT>(entity.DEPARTMENT_ID);