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,9 +69,8 @@ namespace APT.FM.WebApi
             services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder =>
             {
                 builder.AllowAnyOrigin()
-                        .AllowAnyHeader() // 允许任何头
-                        .AllowAnyMethod() // 允许任何方法
-                        ;
+                       .AllowAnyMethod()
+                       .AllowAnyHeader();
             }));
 
             services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@@ -114,13 +113,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");
 
@@ -135,7 +134,7 @@ namespace APT.FM.WebApi
             app.UseMvc();
 
             app.UseStaticFiles();
-
+          
 
             //fMOrganizationService.SetOrgCache();
 
@@ -148,6 +147,6 @@ namespace APT.FM.WebApi
             builder.RegisterComponents();
         }
 
-
+       
     }
 }

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;//多库查询
-                            userFilter.OrgId = orgId;
+                            user.ORG_ID = orgId;
                             userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" };
                             user = this.GetEntity<T_FM_USER>(expression, userFilter);
                             if (user == null)