From 48135e1fdd34bbd4fbc9fa0b1895e1457aefde10 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: Fri, 5 Jun 2026 18:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=BD=93=E7=8F=AD=E7=AD=BE?= =?UTF-8?q?=E5=88=B0BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CurrentClassRecord.cs | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs index ae4381d..d3a105a 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs @@ -426,21 +426,28 @@ namespace APT.FO.WebApi.Controllers.Api.FO model.SHIFT_STATUS = (int)FOShiftStatusEnum.归档; model.AUDIT_DATE = DateTime.Now; var currCalendar = this.GetEntity(t => t.CLASS_ID == model.CLASS_ID); - var currCalendarID = currCalendar.CALENDAR_ID; - var currDepartmentConfig = GetEntity(t => t.TEAM_ID == model.CLASS_TEAM_ID && t.IS_DELETED == false, "Nav_DepartmentCalendarConfig"); - if (currDepartmentConfig != null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) - { - - var searchFilter = new BaseFilter(model.ORG_ID); - searchFilter.SelectField = new string[] { "TEAM_ID", "PERSON_ID", "Nav_Person.Nav_Post", "Nav_Person.Nav_User", "Nav_DepartmentScheduling" }; - var nextClassUsersAll = GetEntities(i => i.DEPARTMENT_SCHEDULING_ID == model.NEXT_CLASS_TEAM_ID && i.Nav_Person.Nav_Post.ID == model.DEPARTMENT_POST_ID && i.Nav_Person.Nav_User.ENABLE_STATUS == 0, searchFilter).ToList(); - if (nextClassUsersAll.Any()) - { - CreateChangeShiftRecord(model, users, files, nextClassUsersAll); + if (currCalendar != null) + { + var currCalendarID = currCalendar.CALENDAR_ID; + var currDepartmentConfig = GetEntity(t => t.TEAM_ID == model.CLASS_TEAM_ID && t.IS_DELETED == false, "Nav_DepartmentCalendarConfig"); + if (currDepartmentConfig != null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) + { + + var searchFilter = new BaseFilter(model.ORG_ID); + searchFilter.SelectField = new string[] { "TEAM_ID", "PERSON_ID", "Nav_Person.Nav_Post", "Nav_Person.Nav_User", "Nav_DepartmentScheduling" }; + var nextClassUsersAll = GetEntities(i => i.DEPARTMENT_SCHEDULING_ID == model.NEXT_CLASS_TEAM_ID && i.Nav_Person.Nav_Post.ID == model.DEPARTMENT_POST_ID && i.Nav_Person.Nav_User.ENABLE_STATUS == 0, searchFilter).ToList(); + if (nextClassUsersAll.Any()) + { + CreateChangeShiftRecord(model, users, files, nextClassUsersAll); + } + else + { + model.REMARK = "未能找到接班人员"; + } } - else - { - model.REMARK = "未能找到接班人员"; + else if (model.IS_HANDOVER) + { + CreateChangeShiftRecord(entity, users, files, null); } } else if (model.IS_HANDOVER)