From 26cdd214baaa09ce75dbcab897ca07a36d8b434c Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 19 Dec 2025 11:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E9=83=A8=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/UserController.cs         | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

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<Guid> listDepIDs = new List<Guid>();
             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_FM_USER_SIGN_FILE>(t => userIds.Contains(t.USER_ID), new BaseFilter(pageFilter.OrgId));