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-04-24 16:22:06 +08:00
parent 59d564d6d1
commit 30f03e6f11
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
View File

@ -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);
}
});