From a16b11aec9905ca6d9e0ad721ca43228619990e5 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Mon, 24 Nov 2025 13:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=91=98=E5=B7=A5=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=20ORG=5FID=20=E9=80=9A=E8=BF=87=E5=89=8D=E7=AB=AF=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=EF=BC=8C=E4=BB=A5=E5=89=8D=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/BIController/H5Controller.cs          | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/H5Controller.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/H5Controller.cs
index cbb10c6..76c1932 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/H5Controller.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/H5Controller.cs
@@ -145,8 +145,14 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                 DataReturn.code = 500;
                 return DataReturn;
             }
+            if (model.ORG_ID == Guid.Empty)
+            {
+                DataReturn.msg = "获取公司信息失败！";
+                DataReturn.code = 500;
+                return DataReturn;
+            }
             var Tenant = this.Request.Headers["Tenant"];
-            Guid orgId = getOrgIdByTenant(Tenant);
+            Guid orgId = model.ORG_ID;
             var isrepeat = GetEntity<T_FM_USER>(t => t.CODE == model.Phone);
             if (isrepeat != null)
             {
@@ -316,29 +322,30 @@ namespace APT.SC.WebApi.Controllers.Api.BI
             public string ID_CARD { get; set; }
             public DateTime InTime { get; set; }
             public int WORKINGYEAR { get; set; }
+            public Guid ORG_ID { get; set; }
         }
 
-        private Guid getOrgIdByTenant(string Tenant)
-        {
-            Guid orgId = Guid.Empty;
-            if (Tenant.Equals("0001"))//XLK
-            {
-                orgId = Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa");
-            }
-            else if (Tenant.Equals("A0000024"))//豫鹭
-            {
-                orgId = Guid.Parse("d9871ba8-0eec-9e4a-bb87-7d5a540d8913");
-            }
-            else if (Tenant.Equals("A0000025"))//金鼎
-            {
-                orgId = Guid.Parse("8b3c41aa-51b1-7ce9-1879-248a038c1b5c");
-            }
-            else if (Tenant.Equals("0002"))//龙岩稀土
-            {
-                orgId = Guid.Parse("8f1cf418-8bf3-ea3f-7a6d-fc5d61247008");
-            }
-            return orgId;
-        }
+        //private Guid getOrgIdByTenant(string Tenant)
+        //{
+        //    Guid orgId = Guid.Empty;
+        //    if (Tenant.Equals("0001"))//XLK
+        //    {
+        //        orgId = Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa");
+        //    }
+        //    else if (Tenant.Equals("A0000024"))//豫鹭
+        //    {
+        //        orgId = Guid.Parse("d9871ba8-0eec-9e4a-bb87-7d5a540d8913");
+        //    }
+        //    else if (Tenant.Equals("A0000025"))//金鼎
+        //    {
+        //        orgId = Guid.Parse("8b3c41aa-51b1-7ce9-1879-248a038c1b5c");
+        //    }
+        //    else if (Tenant.Equals("0002"))//龙岩稀土
+        //    {
+        //        orgId = Guid.Parse("8f1cf418-8bf3-ea3f-7a6d-fc5d61247008");
+        //    }
+        //    return orgId;
+        //}
 
 
         #region     当班工作人员