From d85e73c72d98e5e95d31c13dbdde305b0e553ef4 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 26 Nov 2025 20:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E5=8F=91=20=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=84=8F=E8=AF=86=E8=B0=83=E6=9F=A5=20=E8=AF=95=E5=8D=B7=20?= =?UTF-8?q?=E6=B2=A1=E9=83=A8=E9=97=A8=E7=9A=84=E4=B8=8D=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SEController/1SESafeSurveyController.cs | 2 +- .../Controllers/Api/SEController/6SETrainRecordController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs index 5c48460..d11fe32 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs @@ -142,7 +142,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE var filter = new BaseFilter(entity.ORG_ID); filter.Include = new string[] { "Nav_Person" }; - var allUsers = this.GetEntities(t => !t.CODE.Contains("admin") && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && allUsersIds.Contains(t.ID), filter); + var allUsers = this.GetEntities(t => !t.CODE.Contains("admin") && t.DEPARTMENT_ID.HasValue && !t.PROJECT_ID.HasValue && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && allUsersIds.Contains(t.ID), filter); foreach (var user in allUsersIds) { 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 f81611e..f5a3ba1 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -511,7 +511,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE }); //sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训效果评估调查-" + record.Nav_Notify.NAME, effect.ID, filter.GetOrgId(), (Guid)effect.USER_ID, "", DateTime.Now, DateTime.Now.AddDays(2), 1, "SE022")); - sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训效果评估调查-" + record.Nav_Notify.NAME, effect.ID, filter.GetOrgId(), (Guid)effect.USER_ID, login.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE022")); + sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训效果评估调查-" + record.Nav_Notify.NAME, effect.ID, filter.GetOrgId(), (Guid)effect.USER_ID, login.NAME, DateTime.Now, 1, "SE022", FMTASKTYPE.Default)); } var userCount = record.Nav_Users.Count(t => t.STATUS == SETrainRecordUserStatusEnum.参与 && t.OK == false); if (userCount == 0 && !isReSend)