From cdf2278e8bca27b452d3ed0a070bdd177a68d455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com>
Date: Tue, 9 Apr 2024 11:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CrucialLicenseJobController.cs              | 6 +++---
 .../APT.PF.WebApi/Controllers/Api/TokenController.cs        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
index 4ee0199..d78f815 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
@@ -678,9 +678,9 @@ namespace APT.FO.WebApi.Controllers
                 //传入的识别表CODE不为空
                 if (!string.IsNullOrEmpty(filter.Keyword))
                 {
-                    var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
-                    var tempList = mineType.Split(",").ToList();
-                    var analyze = GetEntity<T_HM_OPERATION_LINK>(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString()),new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" });
+                    //var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
+                    //var tempList = mineType.Split(",").ToList();
+                    var analyze = GetEntity<T_HM_OPERATION_LINK>(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用,new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" });//&& tempList.Contains(t.MineType.ToString())
                     if (analyze!=null)
                     {
                         main.AUDIT_LEVEL=analyze.AUDIT_LEVEL;
diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs
index 5eb41a2..549fee4 100644
--- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs
+++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs
@@ -69,6 +69,7 @@ namespace APT.PF.WebApi.Controllers.Api.FM
                                 return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" });
                             }
                         }
+                        filter.IgnoreOrgRule = true;
                     }
                     else
                     {