From b66267f08fa9963f1f45801a385b21b0b4072b26 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: Mon, 3 Aug 2026 09:15:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=B4=BB=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/TeamActivityController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs index 85a6a01..8f5e350 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs @@ -125,7 +125,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO baseFilter.SelectField = new string[] { "ID", "NAME" }; //指定字段，包括导航属性 var sendUsers = users.Where(t => t.IS_DELETED == false && t.ATTEND_STATUS == (int)FOAttendState.参与).ToList(); var userIds = sendUsers.Select(t => t.USER_ID); - var TeamUser = this.GetEntities(t => userIds.Contains(t.ID), baseFilter).ToList(); + var TeamUser = this.GetEntities(t => t.ENABLE_STATUS == 0, baseFilter).ToList(); var noticeTitles = new List(); var noticeUserIds = new List(); var noticeUserNames = new List(); @@ -148,7 +148,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO noticeTitles.Add("班组安全活动记录表-签到确认"); //} noticeUserIds.Add(rs.USER_ID); - var userName = TeamUser.Where(t => t.ID == rs.USER_ID).FirstOrDefault().NAME; + var userName = TeamUser.Where(t => t.ID == rs.USER_ID)?.FirstOrDefault()?.NAME; noticeUserNames.Add(userName); noticeDataIds.Add(entity.ID); }