From 5cde1c6e9894ae5b2ce2a74a0025a71bc083578c 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: Sat, 29 Nov 2025 15:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FireJobController.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index 5816e4b..54a01b8 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -73,8 +73,10 @@ namespace APT.FO.WebApi.Controllers { var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; - entity.APPLY_USER_ID = loginUserId; - entity.APPLY_DEPARTMENT_ID = departmentId; + if(entity.APPLY_USER_ID == null) + entity.APPLY_USER_ID = loginUserId; + if(entity.APPLY_DEPARTMENT_ID == null) + entity.APPLY_DEPARTMENT_ID = departmentId; if (entity.COMPANY_ID == null) { entity.COMPANY_ID = this.GetEntity(t => t.PARENT_ID == null)?.ID; @@ -285,6 +287,7 @@ namespace APT.FO.WebApi.Controllers monitorFileList.Add(item); } } + T_FM_NOTIFICATION_TASK task = null; List notices = new List(); if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { @@ -421,12 +424,12 @@ namespace APT.FO.WebApi.Controllers }, null, null, null, null, null, "FO043_SHOWPRINT", null,null, FMTASKTYPE.JobSite); return true; } - } - T_FM_NOTIFICATION_TASK task = null; - if (entity.TaskID != Guid.Empty) - { - task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); - task.SOURCE_FORMCODE = "FO043_SHOWPRINT"; + + if (entity.TaskID != Guid.Empty) + { + task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); + task.SOURCE_FORMCODE = "FO043_SHOWPRINT"; + } } this.UnifiedCommit(() => {