From a63123cf338f90fda668e6478101b7be92493994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Tue, 16 Apr 2024 11:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=BA=A4=E5=BA=95=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrucialLicenseJobController.cs | 24 +++++++++++++++---- .../JobActivityRecordController.cs | 6 ++++- .../Controllers/JobEventRecordController.cs | 6 ++++- .../Controllers/PreOperSchController.cs | 6 ++++- .../TechDisclosureFromController.cs | 11 ++++++++- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index e12737e..d64164b 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -392,10 +392,26 @@ namespace APT.FO.WebApi.Controllers { return SafeExecute(() => { - var users = entity.Nav_CrucialLicensePerson.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); - var safeConfirms = entity.Nav_SafeConfirms.Where(t => !t.IS_DELETED).ToList(); - var safeMeasures = entity.Nav_SafeMeasures.Where(t => !t.IS_DELETED).ToList(); - var dealMeasures = entity.Nav_DealMeasures.Where(t => !t.IS_DELETED).ToList(); + var users = entity.Nav_CrucialLicensePerson; + if (users != null && users.Any()) + { + users = users.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); + } + var safeConfirms = entity.Nav_SafeConfirms; + if (safeConfirms != null && safeConfirms.Any()) + { + safeConfirms = safeConfirms.Where(t => !t.IS_DELETED).ToList(); + } + var safeMeasures = entity.Nav_SafeMeasures; + if (safeMeasures != null && safeMeasures.Any()) + { + safeMeasures = safeMeasures.Where(t => !t.IS_DELETED).ToList(); + } + var dealMeasures = entity.Nav_DealMeasures; + if (dealMeasures != null && dealMeasures.Any()) + { + dealMeasures = dealMeasures.Where(t => !t.IS_DELETED).ToList(); + } var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; entity.Nav_CrucialLicensePerson = null; entity.Nav_SafeConfirms = null; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs index 4bd4b3f..78b8cb3 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs @@ -172,7 +172,11 @@ namespace APT.FO.WebApi.Controllers List flowFile = new List(); List measureFile = new List(); T_SE_TRAIN_NOTIFY notify = null; - var users = entity.Nav_JobActivityPerson.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); + var users = entity.Nav_JobActivityPerson; + if (users != null && users.Any()) + { + users = users.Where(t => !t.IS_DELETED).ToList(); + } entity.Nav_JobActivityPerson = null; var details = entity.Nav_Details; entity.Nav_Details = null; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs index 02f651d..62a4ea0 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs @@ -161,7 +161,11 @@ namespace APT.FO.WebApi.Controllers List file = new List(); List flowFile = new List(); List measureFile = new List(); - var users = entity.Nav_JobEventPerson.Where(t=>t.USER_ID != null && !t.IS_DELETED).ToList(); + var users = entity.Nav_JobEventPerson; + if (users != null && users.Any()) + { + users = users.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); + } entity.Nav_JobEventPerson = null; var details = entity.Nav_Details; entity.Nav_Details = null; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs index 086e09f..54aaf24 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs @@ -44,7 +44,11 @@ namespace APT.FM.WebApi.Controllers.Api.FO { return SafeExecute(() => { - var users = entity.Nav_PreOperSchUser.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); + var users = entity.Nav_PreOperSchUser; + if (users != null && users.Any()) + { + users = users.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); + } var files = entity.Nav_PreOperSchFile; entity.Nav_PreOperSchUser = null; entity.Nav_PreOperSchFile = null; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs index e309fa8..ccfc250 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs @@ -89,8 +89,15 @@ namespace APT.FO.WebApi.Controllers return SafeExecute(() => { entity.FORM_STATUS = (int)FOTeamActivityState.草稿; - var persons = entity.Nav_Person.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); + var persons = entity.Nav_Person; + var deleteIds = new List(); + if (persons != null && persons.Any()) + { + deleteIds = persons.Where(t => t.IS_DELETED).Select(m => m.ID).ToList(); + persons = persons.Where(t => !t.IS_DELETED).ToList(); + } entity.Nav_Person = null; + List notices = new List(); T_FM_NOTIFICATION_TASK task = null; T_FO_JOB_ACTIVITY_RECORD record = null; @@ -381,6 +388,8 @@ namespace APT.FO.WebApi.Controllers this.BantchSaveEntityNoCommit(flowList); if (measureList != null && measureList.Any()) this.BantchSaveEntityNoCommit(measureList); + if (deleteIds != null && deleteIds.Any()) + this.BantchDeleteEntityNoCommit(deleteIds); }); return true; });