diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index b272e94..30cf5eb 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -460,7 +460,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM t.IS_DELETED = true; } departUpdateList.Add(t); - var userFirst= userList.FirstOrDefault(m => m.DEPARTMENT_ID == t.ID); + var userFirst = userList.FirstOrDefault(m => m.DEPARTMENT_ID == t.ID); if (userFirst != null && entity.ENABLE_STATUS == 1) { haveUser = true; @@ -477,7 +477,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM } } //departmentList.ForEach(t => t.MineType = entity.MineType); - var userListTemp = userList.Where(t => t.DEPARTMENT_ID!=null && departmentIds.Contains(t.DEPARTMENT_ID.Value)).ToList(); + var userListTemp = userList.Where(t => t.DEPARTMENT_ID != null && departmentIds.Contains(t.DEPARTMENT_ID.Value)).ToList(); userListTemp.ForEach(t => { //var enumValues = new List(); @@ -543,11 +543,19 @@ namespace APT.FM.WebApi.Controllers.Api.FM } foreach (var item in entityUpdateList) { - item.Nav_User = null; item.Nav_ProdutionUnit = null; item.Nav_Unit = null; item.Nav_Parent = null;item.Nav_DepartmentUser = null; + item.Nav_User = null; item.Nav_ProdutionUnit = null; item.Nav_Unit = null; item.Nav_Parent = null; item.Nav_DepartmentUser = null; } if (haveUser) { throw new Exception(message); + } + + var listDepChange = entityUpdateList; + if (entityUpdateList != null && entityUpdateList.Count() > 0) + { + var listDepID = entityUpdateList.Select(e => e.ID); + entityUpdateList = GetEntities(e => listDepID.Contains(e.ID), null).ToList(); + listDepChange = listDepChange.Where(e => !e.IS_DELETED).ToList(); } this.UnifiedCommit(() => { @@ -572,6 +580,8 @@ namespace APT.FM.WebApi.Controllers.Api.FM this.BantchUpdateEntity_noneBase(teamInfos); if (entityUpdateList != null && entityUpdateList.Any()) this.BantchUpdateEntity_noneBase(entityUpdateList); + if (listDepChange != null && listDepChange.Any()) + BantchSaveEntityNoCommit(listDepChange); //if (entity != null) // this.UpdateEntityNoCommit(entity); });