From dd5e007ebac2eb6e0de8ada349268dc53c29de4f Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 6 Aug 2026 10:45:44 +0800
Subject: [PATCH] 213

---
 .../Api/SEController/SETrainRecordReportController.cs       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs
index b66ea94..e3f3c3e 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs
@@ -68,7 +68,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 {
                     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 == 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);
                         if (listUserID != null && listUserID.Count() > 0)
                         {
-                            expression = e => listUserID.Contains(e.ID);
+                            expression = expression.And(e => listUserID.Contains(e.ID));
                         }
                     }
                 }
                 pageFilterUser.FilterGroup = FilterGroup;
                 pageFilterUser.SelectField = new List<string>();
+                pageFilterUser.Sort = "NAME";
+                pageFilterUser.Order = DbOrder.ASC;
                 var listPageUser = this.GetOrderPageEntities<T_FM_USER>(expression, pageFilterUser, "Nav_Department");
                 var listUser = listPageUser.Data;
                 var listData = new List<T_SE_TRAIN_RECORD_REPORT>();