wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

班组活动记录

Browse Source
This commit is contained in:
何美荣 2026-08-03 09:15:33 +08:00
parent 7b2e905d50
commit b66267f08f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
View File

@ -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_FM_USER>(t => userIds.Contains(t.ID), baseFilter).ToList();
var TeamUser = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, baseFilter).ToList();
var noticeTitles = new List<string>();
var noticeUserIds = new List<Guid>();
var noticeUserNames = new List<string>();
@ -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);
}