diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs index cb7506c..e4dafe5 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs @@ -60,6 +60,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE foreach (var item in Nav_Teachers) item.Nav_User = null; } + + + if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { var listCodeCheck = Nav_NewUserDetail.Where(e => !e.IS_DELETED && e.CODE != null && e.CODE.Length > 0).Select(e => e.CODE); @@ -207,6 +210,49 @@ namespace APT.SC.WebApi.Controllers.Api.SE } finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE061_SHOWPRINT"); } + else + { + var allDepartment = Nav_NewUserDetail.Where(t => t.IS_DELETED == false).Select(t => t.USER_DEPARTMENT_ID); + if (allDepartment == null || allDepartment.Count() < 1) + { + //全部都删除了 + entity.IS_DELETED = true; + foreach (var item in Nav_NewUserDetail) + { + item.IS_DELETED = true; + } + foreach (var item in Nav_Teachers) + { + item.IS_DELETED = true; + } + foreach (var item in Nav_Files) + { + item.IS_DELETED = true; + } + foreach (var item in detailFiles) + { + item.IS_DELETED = true; + } + } + else + { + var allUser = GetEntities(t => allDepartment.Contains(t.DEPARTMENT_ID) && t.Nav_ApproveRole != null, new BaseFilter(entity.ORG_ID)); + foreach (var item in Nav_NewUserDetail) + { + if (item.IS_DELETED) + continue; + if (item.Nav_Files != null && item.Nav_Files.Count() > 0) + { + item.Nav_Files.ForEach(nf => + { + nf.USER_DETAIL_ID = item.ID; + }); + detailFiles.AddRange(item.Nav_Files); + item.Nav_Files = null; + } + } + } + } var deleteD = Nav_NewUserDetail.Where(e => e.IS_DELETED && e.USER_ID.HasValue); List listUserDel = null;