diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index a967942..222f246 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -557,14 +557,14 @@ namespace APT.FM.WebApi.Controllers.Api.FM if (entity.Nav_Person.POST_ID == null) { throw new Exception("岗位不允许为空!"); - } - + } + var isRepeat = allUsers.FirstOrDefault(t => t.CODE == entity.CODE); + if (isRepeat != null) + this.ThrowError("050001"); if (isAdd == null) { userList = this.GetEntities(t => (t.CODE == entity.CODE || t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID) && t.ORG_ID == entity.ORG_ID, null, "Nav_Department").ToList(); - var isRepeat = userList.FirstOrDefault(t => t.CODE == entity.CODE); - if (isRepeat != null) - this.ThrowError("050001"); + if (entity.ORG_ID != Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa")) { #region // @@ -681,9 +681,9 @@ namespace APT.FM.WebApi.Controllers.Api.FM { dbRuleStr = string.Join(',', isAdd.Nav_BelongRoles.OrderBy(x => x.BELONG_ROLE_ID).Select(x => x.BELONG_ROLE_ID).Distinct().ToList()); userList = this.GetEntities(t => (t.CODE == entity.CODE || t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID) && t.ID != entity.ID && t.ORG_ID == entity.ORG_ID, null, "Nav_Department").ToList(); - var isRepeat = userList.FirstOrDefault(t => t.CODE == entity.CODE); - if (isRepeat != null) - this.ThrowError("050001"); + //var isRepeat = userList.FirstOrDefault(t => t.CODE == entity.CODE); + //if (isRepeat != null) + // this.ThrowError("050001"); } if (entity.DEPARTMENT_ID == null) {