From 30f03e6f1143645fd2edff34ae1411664a35956e 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: Fri, 24 Apr 2026 16:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E4=BD=9C=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/JobEventRecordController.cs       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
index f0d824a..3927929 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
@@ -750,6 +750,12 @@ namespace APT.FO.WebApi.Controllers
             var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PARENT_NAME");
             if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString()))
                 pageFilter.FilterGroup.Rules.Remove(filter);
+            pageFilter.Include.Add("Nav_CreateUser");
+            pageFilter.Include.Add("Nav_JobEventPerson");
+            pageFilter.Include.Add("Nav_JobEventPerson.Nav_User");
+            pageFilter.SelectField.Add("Nav_JobEventPerson.USER_ID");
+            pageFilter.SelectField.Add("Nav_JobEventPerson.Nav_User.NAME");
+            pageFilter.IgnoreDataRule = true;
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
@@ -758,7 +764,7 @@ namespace APT.FO.WebApi.Controllers
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User");
+                result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter);
             }
             else
             {
@@ -767,7 +773,7 @@ namespace APT.FO.WebApi.Controllers
                 DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
                 if (departmentIds != null && departmentIds.Any())
                 {
-                    result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User");//|| dataIds.Contains(t.ID)
+                    result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
                 }
                 else
                     result.Data = null;
@@ -775,6 +781,7 @@ namespace APT.FO.WebApi.Controllers
             if (result.Data.Any())
             {
                 var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
+                //var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
                 result.Data.ForEach(t =>
                 {
                     if (t.Nav_CreateUser != null && t.Nav_CreateUser.DEPARTMENT_ID != null)
@@ -783,8 +790,8 @@ namespace APT.FO.WebApi.Controllers
                         t.PARENT_NAME = depart?.NAME;
                     }
                     if (t.Nav_JobEventPerson != null && t.Nav_JobEventPerson.Any())
-                    {
-                        var names = t.Nav_JobEventPerson.Select(m => m.Nav_User?.NAME).ToList();
+                    {
+                        var names = t.Nav_JobEventPerson.Where(t => t.USER_ID!=null).Select(m => m.Nav_User?.NAME).Distinct().ToList();
                         t.USER_NAME = string.Join(", ", names);
                     }
                 });