wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:caec6b98c02455b41220cc3f2bc05f0b9206ea5f
Branches Tags
wyw:master
..
compare: wyw:17c6cf4deef4ffc63c6c661c536d6323bc76dc38
Branches Tags
wyw:master

No commits in common. "caec6b98c02455b41220cc3f2bc05f0b9206ea5f" and "17c6cf4deef4ffc63c6c661c536d6323bc76dc38" have entirely different histories.
caec6b98c0 ... 17c6cf4dee

1 changed files with 3 additions and 13 deletions
Show Stats Expand all files Collapse all files

16
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
View File

@ -460,7 +460,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
t.IS_DELETED = true; t.IS_DELETED = true;
} }
departUpdateList.Add(t); 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) if (userFirst != null && entity.ENABLE_STATUS == 1)
{ {
haveUser = true; haveUser = true;
@ -477,7 +477,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
} }
} }
//departmentList.ForEach(t => t.MineType = entity.MineType); //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 => userListTemp.ForEach(t =>
{ {
//var enumValues = new List<string>(); //var enumValues = new List<string>();
@ -543,20 +543,12 @@ namespace APT.FM.WebApi.Controllers.Api.FM
} }
foreach (var item in entityUpdateList) 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) if (haveUser)
{ {
throw new Exception(message); throw new Exception(message);
} }
var listDepChange = entityUpdateList;
if (entityUpdateList != null && entityUpdateList.Count() > 0)
{
var listDepID = entityUpdateList.Select(e => e.ID);
entityUpdateList = GetEntities<T_FM_DEPARTMENT>(e => listDepID.Contains(e.ID), null).ToList();
listDepChange = listDepChange.Where(e => !e.IS_DELETED).ToList();
}
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {
//BantchUpdateEntity_noneBase //BantchUpdateEntity_noneBase
@ -580,8 +572,6 @@ namespace APT.FM.WebApi.Controllers.Api.FM
this.BantchUpdateEntity_noneBase(teamInfos); this.BantchUpdateEntity_noneBase(teamInfos);
if (entityUpdateList != null && entityUpdateList.Any()) if (entityUpdateList != null && entityUpdateList.Any())
this.BantchUpdateEntity_noneBase(entityUpdateList); this.BantchUpdateEntity_noneBase(entityUpdateList);
if (listDepChange != null && listDepChange.Any())
BantchSaveEntityNoCommit(listDepChange);
//if (entity != null) //if (entity != null)
// this.UpdateEntityNoCommit(entity); // this.UpdateEntityNoCommit(entity);
}); });