diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 74b55de..9c49a9b 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -4156,7 +4156,8 @@ namespace APT.BaseData.Services.DomainServices Guid sendUserId = Guid.Empty; string sendName = ""; var sendUser = new T_FM_USER(); - + var userDepartmentId = GetEntity(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID; + var department = GetEntity(userDepartmentId.ToString()); if (entity.LEVEL == FMDepartmentType.公司) { var approveRole = GetEntity(t => t.NAME == "安环部安全员").ID; @@ -4170,8 +4171,6 @@ namespace APT.BaseData.Services.DomainServices } else { - var userDepartmentId = GetEntity(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID; - var department = GetEntity(userDepartmentId.ToString()); Guid departmentId = Guid.Empty; if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组) { @@ -4342,7 +4341,7 @@ namespace APT.BaseData.Services.DomainServices } entity.STATUS = FOPreMeetingStatusEnum.归档; - NotificationTaskService.SendNotificationTask("危险源与风险辨识评价结果", result.ID, orgId, sendUserId, sendName, + NotificationTaskService.SendNotificationTask("《"+department.NAME+"》危险源与风险辨识评价结果", result.ID, orgId, sendUserId, sendName, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(5).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM122", () => { if (entity != null) @@ -4475,7 +4474,8 @@ namespace APT.BaseData.Services.DomainServices Guid sendUserId = Guid.Empty; string sendName = ""; var sendUser = new T_FM_USER(); - + var userDepartmentId = GetEntity(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID; + var department = GetEntity(userDepartmentId.ToString()); if (entity.LEVEL == FMDepartmentType.公司) { var approveRole = GetEntity(t => t.NAME == "安环部安全员").ID; @@ -4489,8 +4489,6 @@ namespace APT.BaseData.Services.DomainServices } else { - var userDepartmentId = GetEntity(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID; - var department = GetEntity(userDepartmentId.ToString()); Guid departmentId = Guid.Empty; if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组) { @@ -4613,7 +4611,7 @@ namespace APT.BaseData.Services.DomainServices } } entity.STATUS = FOPreMeetingStatusEnum.归档; - NotificationTaskService.SendNotificationTask("职业危害辨识评价结果", result.ID, orgId, sendUserId, sendName, + NotificationTaskService.SendNotificationTask("《"+department.NAME+">职业危害辨识评价结果", result.ID, orgId, sendUserId, sendName, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(5).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM122", () => { if (entity != null)