From bfa5894be297f885d1ab6ca5904275c45d8c3376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 14 Jan 2026 08:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E5=89=8D=E4=BC=9A=E8=B7=91=E6=89=B9?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APT.PP.WebApi/Controllers/Api/FOController.cs    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
index 0118fb8..1123e3e 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
@@ -96,9 +96,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                             shift.RUN_STATUS = true;
                             //查出当前班组
                             var currentTeam = shift.Nav_Team;
-                            var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam.Nav_ChargePerson.Nav_User.ID);
-                            var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam.Nav_ChargePerson.Nav_User.ID;
-                            var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam.Nav_ChargePerson.Nav_User.NAME;
+                            var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID);
+                            var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID;
+                            var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME;
                             //当前班组的人员
                             var currentTeamUsers = shift.Nav_DepartmentSchedulingDetail;
                             T_FO_PRE_SHIFT_MEETING_RECORD record = new T_FO_PRE_SHIFT_MEETING_RECORD(); ;
@@ -244,9 +244,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                             var depart = departs.FirstOrDefault(t=>t.TEAM_ID == shift.TEAM_ID);
                             //查出当前班组
                             var currentTeam = shift.Nav_Team;
-                            var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam.Nav_ChargePerson.Nav_User.ID);
-                            var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam.Nav_ChargePerson.Nav_User.ID;
-                            var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam.Nav_ChargePerson.Nav_User.NAME;
+                            var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID);
+                            var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID;
+                            var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME;
                             var isExsist = preShiftMeetings.FirstOrDefault(t=>t.TEAM_ID == shift.TEAM_ID && t.START_TIME.Date == shift.START_TIME.Date);
                             if (isExsist != null)
                             {