diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index d6bc884..5d0ec97 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -280,24 +280,34 @@ namespace APT.FM.WebApi.Controllers.Api.FM List listDepIDs = new List(); if (this.Request.Headers.ContainsKey("Datarule")) { - string strDeps = this.Request.Headers["Datarule"].ToString(); - if (strDeps.Length > 0) + string telnetCode = Request.Headers["Tenant"]; + Guid? ORGID = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId; + + if (ORGID.HasValue && ORGID.Value.ToString().StartsWith(telnetCode)) { - string[] arry = strDeps.Split(","); - foreach (var item in arry) + string strDeps = this.Request.Headers["Datarule"].ToString(); + if (strDeps.Length > 0) { - try + string[] arry = strDeps.Split(","); + foreach (var item in arry) { - listDepIDs.Add(new Guid(item)); + try + { + listDepIDs.Add(new Guid(item)); + } + catch { } } - catch { } } + express = express.And(e => e.DEPARTMENT_ID.HasValue && listDepIDs.Contains(e.DEPARTMENT_ID.Value)); + } + else + { + } - 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) + if (result.Data != null && result.Data.Count() > 0) { var userIds = result.Data.Select(t => t.ID).ToList(); var signs = this.GetEntities(t => userIds.Contains(t.USER_ID), new BaseFilter(pageFilter.OrgId));