From 7de38274ad517c79feba8060b6e7b550716a8b69 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, 23 Jan 2026 10:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/UserController.cs | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index 9560e0e..a967942 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -530,7 +530,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM { return SafeExecute(() => { - //var allUsers = this.GetEntities(t => t.IS_DELETED == false, null, "Nav_ApproveRole"); + var allUsers = this.GetEntities(t => t.IS_DELETED == false, null, "Nav_ApproveRole"); var isAdd = this.GetEntity(entity.ID.ToString(), "Nav_ApproveRole", "Nav_BelongRoles"); string dbRuleStr = string.Empty; var userList = new List(); @@ -793,25 +793,28 @@ namespace APT.FM.WebApi.Controllers.Api.FM if (isExist != null) this.ThrowError("070001"); } - //删除旧的排班，在新的排班里面加入 - deleteDepartScheIds = this.GetEntities(t =>t.Nav_DepartmentScheduling!=null && t.Nav_DepartmentScheduling.DATE_TIME >= DateTime.Now.Date && t.Nav_DepartmentScheduling.START_TIME >= DateTime.Now && t.PERSON_ID == entity.PERSON_ID,new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); - if (departScheIds != null && departScheIds.Any()) + var oldUser = allUsers.FirstOrDefault(t => t.ID == entity.ID); + if (oldUser != null && oldUser.DEPARTMENT_ID != entity.DEPARTMENT_ID) { - var departScheDetailTemps = this.GetEntities(t => departScheIds.Contains(t.DEPARTMENT_SCHEDULING_ID) && t.PERSON_ID == entity.PERSON_ID, new BaseFilter(entity.ORG_ID)).ToList(); - foreach (var id in departScheIds) + //删除旧的排班，在新的排班里面加入 + deleteDepartScheIds = this.GetEntities(t => t.Nav_DepartmentScheduling != null && t.Nav_DepartmentScheduling.DATE_TIME >= DateTime.Now.Date && t.Nav_DepartmentScheduling.START_TIME >= DateTime.Now && t.PERSON_ID == entity.PERSON_ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); + if (departScheIds != null && departScheIds.Any()) { - var detail = departScheDetailTemps.FirstOrDefault(t => t.DEPARTMENT_SCHEDULING_ID == id); - if (detail == null) + var departScheDetailTemps = this.GetEntities(t => departScheIds.Contains(t.DEPARTMENT_SCHEDULING_ID) && t.PERSON_ID == entity.PERSON_ID, new BaseFilter(entity.ORG_ID)).ToList(); + foreach (var id in departScheIds) { - T_FM_DEPARTMENT_SCHEDULING_DETAIL de = new T_FM_DEPARTMENT_SCHEDULING_DETAIL(); - de.ORG_ID = entity.ORG_ID; - de.DEPARTMENT_SCHEDULING_ID = id; - de.PERSON_ID = entity.PERSON_ID.Value; - departScheDetails.Add(de); + var detail = departScheDetailTemps.FirstOrDefault(t => t.DEPARTMENT_SCHEDULING_ID == id); + if (detail == null) + { + T_FM_DEPARTMENT_SCHEDULING_DETAIL de = new T_FM_DEPARTMENT_SCHEDULING_DETAIL(); + de.ORG_ID = entity.ORG_ID; + de.DEPARTMENT_SCHEDULING_ID = id; + de.PERSON_ID = entity.PERSON_ID.Value; + departScheDetails.Add(de); + } } } } - //} if (entity.APPROVE_ROLE_ID != null)