From 9ef92b332b247b0c7c155f44ab7ee577f4c73f6d Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Fri, 20 Sep 2024 18:58:32 +0800
Subject: [PATCH] 1

---
 webapp/controller/CircuitController.class.php | 2 +-
 webapp/controller/OtherController.class.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/CircuitController.class.php b/webapp/controller/CircuitController.class.php
index da79b128..82a9fffa 100644
--- a/webapp/controller/CircuitController.class.php
+++ b/webapp/controller/CircuitController.class.php
@@ -24,7 +24,7 @@ class CircuitController extends  BaseAuthedController {
             $this->_rspErr(1, 'server error1');
             die;
         }
-        if (!(count(CIRCUIT_MATCH_SERVER_LIST) <= 0 && in_array(myself()->_getZid(), CIRCUIT_MATCH_SERVER_LIST))) {
+        if (!(count(CIRCUIT_MATCH_SERVER_LIST) <= 0 || in_array(myself()->_getZid(), CIRCUIT_MATCH_SERVER_LIST))) {
             $this->_rspErr(1, 'server error2');
             die;
         }
diff --git a/webapp/controller/OtherController.class.php b/webapp/controller/OtherController.class.php
index 655ebd98..d76f67ad 100644
--- a/webapp/controller/OtherController.class.php
+++ b/webapp/controller/OtherController.class.php
@@ -389,7 +389,7 @@ class OtherController extends BaseAuthedController {
                 if ($isOpen) {
                     if ($modeMeta['mapMode'] == \mt\MapMode::CIRCUIT_MODE){
                         if (myself()->_switchIsOpen('circuitMatch')) {
-                            if (count(CIRCUIT_MATCH_SERVER_LIST) <= 0 &&
+                            if (count(CIRCUIT_MATCH_SERVER_LIST) <= 0 ||
                                 in_array(myself()->_getZid(), CIRCUIT_MATCH_SERVER_LIST)) {
                                 array_unshift($modeList,$temp);
                             }