APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs

@@ -280,34 +280,24 @@ namespace APT.FM.WebApi.Controllers.Api.FM
             List<Guid> listDepIDs = new List<Guid>();
             if (this.Request.Headers.ContainsKey("Datarule"))
             {
-                string telnetCode = Request.Headers["Tenant"];
+                string strDeps = this.Request.Headers["Datarule"].ToString();
-                Guid? ORGID = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
+                if (strDeps.Length > 0)
-
-                if (ORGID.HasValue && ORGID.Value.ToString().StartsWith(telnetCode))
                 {
-                    string strDeps = this.Request.Headers["Datarule"].ToString();
+                    string[] arry = strDeps.Split(",");
-                    if (strDeps.Length > 0)
+                    foreach (var item in arry)
                     {
-                        string[] arry = strDeps.Split(",");
+                        try
-                        foreach (var item in arry)
                         {
-                            try
+                            listDepIDs.Add(new Guid(item));
-                            {
-                                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 != null && result.Data.Count() > 0)
+            if (result.Data.Count() > 0)
             {
                 var userIds = result.Data.Select(t => t.ID).ToList();
                 var signs = this.GetEntities<T_FM_USER_SIGN_FILE>(t => userIds.Contains(t.USER_ID), new BaseFilter(pageFilter.OrgId));