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

213

Browse Source
This commit is contained in:
wyw 2026-08-06 10:45:44 +08:00
parent 56fba1f3b3
commit dd5e007eba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs
View File

@ -68,7 +68,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
FilterGroup.Rules.Add(Fn); FilterGroup.Rules.Add(Fn);
} }
Expression<Func<T_FM_USER, bool>> expression = null; Expression<Func<T_FM_USER, bool>> expression = e => e.DEPARTMENT_ID.HasValue;
if (Rules.Count > 0) if (Rules.Count > 0)
{ {
if (Rules.Count == 1 && Fn != null) if (Rules.Count == 1 && Fn != null)
@ -80,12 +80,14 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var listUserID = listInfo.Where(e => e.USER_ID.HasValue).Select(e => e.USER_ID.Value); var listUserID = listInfo.Where(e => e.USER_ID.HasValue).Select(e => e.USER_ID.Value);
if (listUserID != null && listUserID.Count() > 0) if (listUserID != null && listUserID.Count() > 0)
{ {
expression = e => listUserID.Contains(e.ID); expression = expression.And(e => listUserID.Contains(e.ID));
} }
} }
} }
pageFilterUser.FilterGroup = FilterGroup; pageFilterUser.FilterGroup = FilterGroup;
pageFilterUser.SelectField = new List<string>(); pageFilterUser.SelectField = new List<string>();
pageFilterUser.Sort = "NAME";
pageFilterUser.Order = DbOrder.ASC;
var listPageUser = this.GetOrderPageEntities<T_FM_USER>(expression, pageFilterUser, "Nav_Department"); var listPageUser = this.GetOrderPageEntities<T_FM_USER>(expression, pageFilterUser, "Nav_Department");
var listUser = listPageUser.Data; var listUser = listPageUser.Data;
var listData = new List<T_SE_TRAIN_RECORD_REPORT>(); var listData = new List<T_SE_TRAIN_RECORD_REPORT>();