From 7c3eda48a5d939319d7efb9b9afd821f25fde20c Mon Sep 17 00:00:00 2001
From: ccy <55274652@qq.com>
Date: Thu, 16 Oct 2025 10:03:33 +0800
Subject: [PATCH] =?UTF-8?q?APP=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APT.MicroApi/APT.FM.WebApi/Startup.cs         | 23 ++++++++++---------
 .../Controllers/Api/LoginController.cs        |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/APT.MicroApi/APT.FM.WebApi/Startup.cs b/APT.MicroApi/APT.FM.WebApi/Startup.cs
index 7252390..6689739 100644
--- a/APT.MicroApi/APT.FM.WebApi/Startup.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Startup.cs
@@ -39,13 +39,13 @@ namespace APT.FM.WebApi
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
-          
+
             var repository = LogManager.GetRepository
                     (System.Reflection.Assembly.GetEntryAssembly());
-			var fileInfo = new FileInfo("log4net.config");
-			if(!fileInfo.Exists)
-				fileInfo=new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config"));
-			XmlConfigurator.Configure(repository, fileInfo);
+            var fileInfo = new FileInfo("log4net.config");
+            if (!fileInfo.Exists)
+                fileInfo = new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config"));
+            XmlConfigurator.Configure(repository, fileInfo);
             ConfigurationManager.Register(configuration);
             InitUtils.Init();
         }
@@ -69,8 +69,9 @@ namespace APT.FM.WebApi
             services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder =>
             {
                 builder.AllowAnyOrigin()
-                       .AllowAnyMethod()
-                       .AllowAnyHeader();
+                        .AllowAnyHeader() // 允许任何头
+                        .AllowAnyMethod() // 允许任何方法
+                        ;
             }));
 
             services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@@ -113,13 +114,13 @@ namespace APT.FM.WebApi
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
             }
-           
+
 
             Infrastructure.Api.HttpContext.Register(app.ApplicationServices.
                     GetRequiredService<IHttpContextAccessor>()
                 );
 
-       
+
 
             app.UseCors("AllowAllPolicy");
 
@@ -134,7 +135,7 @@ namespace APT.FM.WebApi
             app.UseMvc();
 
             app.UseStaticFiles();
-          
+
 
             //fMOrganizationService.SetOrgCache();
 
@@ -147,6 +148,6 @@ namespace APT.FM.WebApi
             builder.RegisterComponents();
         }
 
-       
+
     }
 }
diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
index 227bb65..71763b0 100644
--- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
+++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
@@ -325,7 +325,7 @@ namespace APT.PF.WebApiControllers.Api.PF
                             var userFilter = new BaseFilter(orgId);
                             //userFilter.IgnoreOrgRule = true;
                             //userFilter.IsMultipleDb = true;//多库查询
-                            user.ORG_ID = orgId;
+                            userFilter.OrgId = orgId;
                             userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" };
                             user = this.GetEntity<T_FM_USER>(expression, userFilter);
                             if (user == null)