diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFHomeTitleController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFHomeTitleController.cs index 6aa4e45..7c0b089 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFHomeTitleController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFHomeTitleController.cs @@ -41,7 +41,7 @@ namespace APT.PF.WebApiControllers.Api.PF try { - if (entity.ISTOCHILE) + if (entity.ISTOCHILE&& entity.ORG_ID.HasValue&&entity.ORG_ID.ToString().StartsWith("0300000")) { #region 总部 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 12ba976..9762d43 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs @@ -62,6 +62,17 @@ namespace APT.SC.WebApi.Controllers.Api.SE } 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); + if (listCodeCheck != null && listCodeCheck.Count() > 0) + { + var listUserID = Nav_NewUserDetail.Where(e => !e.IS_DELETED && e.USER_ID.HasValue && e.CODE != null && e.CODE.Length > 0).Select(e => e.USER_ID.Value); + var listUCodeCheck = GetEntities(e => !e.IS_DELETED && listCodeCheck.Contains(e.CODE) && !listUserID.Contains(e.ID), null, null).Select(e => e.CODE); + if (listUCodeCheck != null && listUCodeCheck.Count() > 0) + { + throw new Exception("工号不能重复【" + String.Join(",", listUCodeCheck) + "】"); + } + } + var endTime = DateTime.Now.AddDays(10); var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59); if (entity.TRAINNING_TIME == "0" || string.IsNullOrEmpty(entity.TRAINNING_TIME))