diff --git a/APT.BaseData.Domain/IServices/FM/IFMUserService.cs b/APT.BaseData.Domain/IServices/FM/IFMUserService.cs index b14a002..4bb102f 100644 --- a/APT.BaseData.Domain/IServices/FM/IFMUserService.cs +++ b/APT.BaseData.Domain/IServices/FM/IFMUserService.cs @@ -105,9 +105,9 @@ namespace APT.BaseData.Domain.IServices.FM List GetDepPostUser(ref string Msg, Guid DEPARTMENT_ID, Guid POST_ID, bool IsOnly); /// - /// 找安环部人员 + /// 找安环部人员 默认 安环安全员 /// - /// 1 NUM 从小到大 找第一个 2 NUM 找老大 + /// 1 NUM 从小到大 找第一个 10 NUM 找老大 /// 1 /// T_FM_USER GetSafeApproveUser(Guid ORG_ID, int UserType = 1); diff --git a/APT.BaseData.Services/Services/FM/FMUserService.cs b/APT.BaseData.Services/Services/FM/FMUserService.cs index 892c39e..e43afe6 100644 --- a/APT.BaseData.Services/Services/FM/FMUserService.cs +++ b/APT.BaseData.Services/Services/FM/FMUserService.cs @@ -997,7 +997,7 @@ namespace APT.BaseData.Services.Services.FM #region 找安环部人员 /// - /// 找安环部人员 + /// 找安环部人员 默认 安环安全员 /// /// 1 NUM 从小到大 找第一个 10 NUM 找老大 /// 1 diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index f5a3ba1..9934e55 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -25,9 +25,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE public class SETrainRecordController : AuthorizeApiController { IFMNotificationTaskService NotificationTaskService { get; set; } - public SETrainRecordController(IFMNotificationTaskService notificationTaskService) + IFMUserService UserService { get; set; } + public SETrainRecordController(IFMNotificationTaskService notificationTaskService, IFMUserService userService) { NotificationTaskService = notificationTaskService; + UserService = userService; } /// /// 保存 @@ -517,12 +519,17 @@ namespace APT.SC.WebApi.Controllers.Api.SE if (userCount == 0 && !isReSend) { record.STATUS = SETrainRecordStatus.审阅中; - var chargeUser = GetEntity(t => t.Nav_ApproveRole.NAME == "安环部负责人"); - if (chargeUser == null) + T_FM_USER chargeUser = UserService.GetSafeApproveUser(record.ORG_ID.Value, 10); + + //var chargeUser = GetEntity(t => t.Nav_ApproveRole.NAME == "安环部负责人"); + //if (chargeUser == null) + //{ + // chargeUser = GetEntity(t => t.Nav_ApproveRole.NAME == "安环部安全员"); + //} + if (chargeUser != null) { - chargeUser = GetEntity(t => t.Nav_ApproveRole.NAME == "安环部安全员"); + sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训记录完成待审阅-" + record.Nav_Notify.NAME, Guid.Parse(filter.Keyword), filter.GetOrgId(), chargeUser.ID, chargeUser.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE017_SHOWPRINT")); } - sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训记录完成待审阅-" + record.Nav_Notify.NAME, Guid.Parse(filter.Keyword), filter.GetOrgId(), chargeUser.ID, chargeUser.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE017_SHOWPRINT")); } UnifiedCommit(() => {