From 2ba01d1f3bd59b775a9dc546e6286ae2cac0cb02 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: Tue, 24 Mar 2026 17:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=B9=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/FM/FMFlowPermitService.cs | 44 +++++++++++-------- .../Controllers/Api/BasicLibraryController.cs | 2 +- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs index d04bccb..1a5cfcd 100644 --- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs +++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs @@ -464,7 +464,7 @@ namespace APT.BaseData.Services.Services.FM if (detail.APPROVE_USER_ID != null) appdetails.Add(detail); }); - appdetails = appdetails.OrderBy(t => t.NUM).GroupBy(m=>m.APPROVE_USER_ID).Select(n=>n.LastOrDefault()).ToList(); + //appdetails = appdetails.OrderBy(t => t.NUM).GroupBy(m=>m.APPROVE_USER_ID).Select(n=>n.LastOrDefault()).ToList(); //var loginUser = users.FirstOrDefault(t => t.ID == loginUserId); //var departUser = this.GetEntity(t => (t.USER_ID == loginUserId || t.CHARGEUSER_ID == loginUserId) && (t.NAME.Contains("安全环保") || t.NAME.Contains("安环部"))); //if (departUser != null || (loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("安环部负责人")) || (loginUser.Nav_ApproveRole != null && loginUser.Nav_ApproveRole.NAME.Contains("安环部安全员"))) @@ -482,7 +482,7 @@ namespace APT.BaseData.Services.Services.FM // appdetails.Remove(tempCharge); // } //} - appdetails.ForEach(i => i.Nav_ApproveRole = null); + appdetails.OrderBy(t => t.NUM).ForEach(i => i.Nav_ApproveRole = null); appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM)).ForEach(i => i.IS_CURRENT = true); //当前节点 @@ -511,18 +511,18 @@ namespace APT.BaseData.Services.Services.FM LogApproveDetailReduce(approve, loginUserId.Value, JsonApproveDetail, appdetails); } - var sendUserId = appdetails.Where(i => i.NUM == curentApprove.NUM).Select(t => (Guid)t.APPROVE_USER_ID).FirstOrDefault(); + var sendUserIds = appdetails.Where(i => i.NUM == curentApprove.NUM).Select(t => (Guid)t.APPROVE_USER_ID).ToList(); //var sendUserName = users.Where(i => i.ID == sendUserId).FirstOrDefault().NAME; - var ue = users.Where(i => i.ID == sendUserId).FirstOrDefault(); - string sendUserName = string.Empty; - if (ue != null) - { - sendUserName = users.Where(i => i.ID == sendUserId).FirstOrDefault().NAME; - } - else - { - sendUserName = GetEntity(t => t.ID == sendUserId && t.ENABLE_STATUS == 0)?.NAME; - } + //var ue = users.Where(i => i.ID == sendUserId).FirstOrDefault(); + //string sendUserName = string.Empty; + //if (ue != null) + //{ + // sendUserName = users.Where(i => i.ID == sendUserId).FirstOrDefault().NAME; + //} + //else + //{ + // sendUserName = GetEntity(t => t.ID == sendUserId && t.ENABLE_STATUS == 0)?.NAME; + //} string taskName = approveTaskName; if (string.IsNullOrEmpty(taskName)) @@ -563,11 +563,19 @@ namespace APT.BaseData.Services.Services.FM default: break; } } - - //发消息 - notice = NotificationTaskService.InsertUserNoticeTaskModel(taskName, approve.ID, approve.ORG_ID, (Guid)sendUserId, sendUserName, startTime, - endTime, (int)FMNoticeTypeEnum.审批, "PF119"); - + if (sendUserIds != null && sendUserIds.Any()) + { + foreach (var sendUserId in sendUserIds) + { + if (sendUserId != null) + { + var sendUserName = users.FirstOrDefault(i => i.ID == sendUserId)?.NAME; + //发消息 + notice = NotificationTaskService.InsertUserNoticeTaskModel(taskName, approve.ID, approve.ORG_ID, (Guid)sendUserId, sendUserName, startTime, + endTime, (int)FMNoticeTypeEnum.审批, "PF119"); + } + } + } } } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs index 7b203d6..d645e90 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs @@ -971,7 +971,7 @@ namespace APT.SK.WebApi.Controllers pageFilter.SelectField.Add("Nav_Details.NUM"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.Nav_DetailContents.Nav_Contents.CHECKCONTENT"); - var result = WitOrderPaged(null, pageFilter); + var result = GetOrderPageEntities(null, pageFilter); if (result != null && result.Data != null && result.Data.Any()) { foreach (var item in result.Data)