From 6ed581436a4a73757d697e0f15ef23d5895db0af Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Thu, 11 Jul 2024 19:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E6=B3=A8=E9=94=80=20=E6=B3=A8=E5=86=8C=E8=88=AA=E7=BA=BF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E7=94=B1=E4=BA=8E?=
 =?UTF-8?q?=E6=B3=A8=E9=94=80=20=E6=B3=A8=E5=86=8C=E5=85=AC=E7=94=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=B3=A8=E9=94=80=E6=97=B6=E4=B9=9F?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A3=9E=E6=9C=BAid=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=E6=98=AF=E8=82=AF=E5=AE=9A=E5=AD=98=E5=9C=A8=E7=9A=84=20?=
 =?UTF-8?q?=E6=89=80=E4=BB=A5=E4=B8=8D=E7=94=A8=E6=A3=80=E6=B5=8B=20=09[?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B]=EF=BC=9A=E5=88=A4=E6=96=AD=20=E6=B3=A8?=
 =?UTF-8?q?=E9=94=80=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=98=AF=20?=
 =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E4=BC=A0id=E4=B8=BA=E7=A9=BA=20=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=A9=BA=E5=B0=B1=E8=B7=B3=E8=BF=87=E4=B8=8D=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E7=BB=93=09=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：构建过程或辅助工具的变动
---
 .../Controller/PlaneController.class.php      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/FlyCube/MpApi/Controller/PlaneController.class.php b/FlyCube/MpApi/Controller/PlaneController.class.php
index 63d9640..baf2b5a 100644
--- a/FlyCube/MpApi/Controller/PlaneController.class.php
+++ b/FlyCube/MpApi/Controller/PlaneController.class.php
@@ -157,26 +157,29 @@ class PlaneController extends PublicController
 		}
 	}
 	/**
-	 * @description: 飞机在站点上注册航线
+	 * @description: 飞机在站点上注册航线 或 注销航线
 	 */
 	public function lockSite()
 	{
 		//总管理员 可接收任何shop_id 非总管理员 只可以调用自身shop_id 否则会中断
 		$this->isPower();
 
-		if ($_REQUEST['id'] && $_REQUEST['plane_id'] && $_REQUEST['runing']) {
+		if ($_REQUEST['id'] && $_REQUEST['runing']) {
 			$rsDb = D('receive_site');
 			$where['id'] = $_REQUEST['id'];
 			$where['shop_id'] = $_REQUEST['shop_id'];
-			//合法检查
-			$rsCheck = $rsDb->where($where)->select();
-			foreach ($rsCheck as $key => $value) {
-				$runingPlanes = explode(',', $value['runing']);
-				if (in_array($_REQUEST['plane_id'], $runingPlanes)) {
-					echo json_encode(array('status' => 0, 'msg' => '此飞机已经组测过航线了'));
-					exit;
+			//航线注册 合法检查  ps:注销跳过此步骤 
+			if ($_REQUEST['plane_id'] != "") { //注册航线调用接口时会传飞机id过来
+				$rsCheck = $rsDb->where($where)->select();
+				foreach ($rsCheck as $key => $value) {
+					$runingPlanes = explode(',', $value['runing']);
+					if (in_array($_REQUEST['plane_id'], $runingPlanes)) {
+						echo json_encode(array('status' => 0, 'msg' => '此飞机已经注册过航线了！'));
+						exit;
+					}
 				}
 			}
+
 			//注册航线
 			if ($_REQUEST['runing'] == "null") {
 				$data['runing'] = null;