diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index 42db980..5a0c625 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -276,6 +276,26 @@ namespace APT.FM.WebApi.Controllers.Api.FM else express = express.And(e => !e.PROJECT_ID.HasValue); } + + List listDepIDs = new List(); + if (this.Request.Headers.ContainsKey("Datarule")) + { + string strDeps = this.Request.Headers["Datarule"].ToString(); + if (strDeps.Length > 0) + { + string[] arry = strDeps.Split(","); + foreach (var item in arry) + { + try + { + listDepIDs.Add(new Guid(item)); + } + catch { } + } + } + express = express.And(e => e.DEPARTMENT_ID.HasValue && listDepIDs.Contains(e.DEPARTMENT_ID.Value)); + } + var result = this.WitOrderPaged(express, pageFilter); if (result.Data.Count() > 0) { @@ -905,7 +925,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM var enumValues = new List(); productionUnit.ForEach(t => { - t.USER_ID = entity.ID; t.Nav_Enums = null;t.Nav_Unit = null; + t.USER_ID = entity.ID; t.Nav_Enums = null; t.Nav_Unit = null; var value = enumList.FirstOrDefault(m => m.ID == t.ENUMS_ID)?.VALUE.ToString(); enumValues.Add(value); });