From 7721e4c616fa071649b3c1585b7390552de65a63 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Wed, 10 Dec 2025 10:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=B5=B7=E9=A3=9E=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs              | 4 ++--
 .../ServiceControllers/AirportMaintenanceController.cs        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
index c1f545b..f147b31 100644
--- a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
+++ b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
@@ -581,7 +581,7 @@ namespace OpenAuth.App.ServiceApp
             };
         }
         //天气预报和是否有人在操作
-        public async Task<Response<dynamic>> IsCanFly(string sn, string dock, string address = "兰山")
+        public async Task<Response<dynamic>> IsCanFly(string userid, string sn, string dock, string address = "兰山")
         {
             var rainThreshforecast = 3; // 天气预报雨量
             var windSpeedThresh = 12;// 机场设定雨量
@@ -592,7 +592,7 @@ namespace OpenAuth.App.ServiceApp
             islock = existingLocked.Any(u => u == sn);
             //查找被谁锁定
             var entries = ParseClient(await _redisCacheContext.HashGetAllAsync($"client:{sn}"));
-            if (islock)
+            if (islock && entries.UserId != userid)
                 return new Response<dynamic> { Result = new { status = false, msg = "设备已被" + entries?.UserName + "锁定" } };
             switch (dock)
             {
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
index 0904756..5fa36fa 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
@@ -841,12 +841,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public async Task<Response<dynamic>> IsCanFly(string address, string sn, string dock)
+        public async Task<Response<dynamic>> IsCanFly(string userid, string address, string sn, string dock)
         {
             var result = new Response<dynamic>();
             try
             {
-                result = await _app.IsCanFly(sn, dock, address);
+                result = await _app.IsCanFly(userid, sn, dock, address);
             }
             catch (Exception ex)
             {