From ad8f9dbae95999662a296cdd21ae21996e86ba8f Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Tue, 9 Jul 2024 19:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0]=EF=BC=9A=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A?=
 =?UTF-8?q?=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09?=
 =?UTF-8?q?=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 FlyCube/MpApi/Controller/PlaneController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FlyCube/MpApi/Controller/PlaneController.class.php b/FlyCube/MpApi/Controller/PlaneController.class.php
index e12df08..a52eca7 100644
--- a/FlyCube/MpApi/Controller/PlaneController.class.php
+++ b/FlyCube/MpApi/Controller/PlaneController.class.php
@@ -268,14 +268,14 @@ class PlaneController extends PublicController
 			//检查当前站点是否有飞机正在执行任务 有则打断 不进行更新
 			$field = array('runing');
 			$tempCheck = $rsDb->where($where)->field($field)->find();
-			if (!empty($tempCheck['runing']) && !$_REQUEST['isCoerce']) {
+			if (!empty($tempCheck['runing'])) {
 				// 将 runing 字段的字符串按逗号分割成数组
 				$runingArray = explode(',', $tempCheck['runing']);
 				// 去除空元素和空格
 				$runingArray = array_map('trim', array_filter($runingArray));
 				// 检查数组是否有值
 				if (!empty($runingArray)) {
-					exit(json_encode(array('status' => -1, 'msg' => '此站点可能有飞机正在执行任务。请确认是否安全！')));
+					exit(json_encode(array('status' => 0, 'msg' => '此站点有飞机正在执行任务。待任务结束后再试！')));
 				}
 			}
 			// 更新站点