Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

APT.MicroApi/APT.FM.WebApi/Startup.cs

@@ -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>();

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)