From b55c1ab0c57d30d8b2d7a890c177f26060a49851 Mon Sep 17 00:00:00 2001
From: YCC <ycc@hainatravel.com>
Date: Thu, 27 Mar 2025 11:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=BF=81=E7=A7=BB=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=88=B0=E5=8F=A6=E5=A4=96=E4=B8=80=E4=B8=AA=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 6 +++---
 application/helpers/info_helper.php         | 2 +-
 application/models/infoStructures_model.php | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 2142959c..e2e2986d 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -92,14 +92,14 @@ class Information extends CI_Controller
     $Structure = $this->InfoStructures_model->Detail($is_id);
     //目标文章结构信息
     $Structure_parent = $this->InfoStructures_model->Detail($is_parent_id);
-    //只能移动到本站点下
-    if ($Structure->is_sitecode == $Structure_parent->is_sitecode) {
+    //只能移动到本站点下，20250327改为允许搬迁到其它站点 ycc
+    //if ($Structure->is_sitecode == $Structure_parent->is_sitecode) {
       //不能搬迁到自己的子节点下
       if (strpos(',' . $Structure_parent->is_path, ',' . $is_id . ',') == false) {
         $this->InfoStructures_model->set_path($is_parent_id, $is_id);
       }
       //信息的区域类型和id也要修改 todo
-    }
+    //}
     $data[] = array('name' => 'ok', 'value' => $this->lang->line('structures_success_move'));
     echo json_encode($data);
     $this->Logs_model->move($is_id);
diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php
index cc65b805..68ba1c55 100644
--- a/application/helpers/info_helper.php
+++ b/application/helpers/info_helper.php
@@ -103,7 +103,7 @@ function is_mobile_first()
 {
     $CI = &get_instance();
     $sitecode = $CI->config->item('site_code');
-    if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin") {
+    if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'jh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin") {
         return true;
     } else {
         return false;
diff --git a/application/models/infoStructures_model.php b/application/models/infoStructures_model.php
index f88cfb5b..de7abd0d 100644
--- a/application/models/infoStructures_model.php
+++ b/application/models/infoStructures_model.php
@@ -224,13 +224,15 @@ class InfoStructures_model extends CI_Model
         $set_parent_id = $parent->is_id;
         $set_level = $parent->is_level + 1;
         $set_path = $parent->is_path . $is_id . ',';
+        $set_is_sitecode = $parent->is_sitecode;
 
         $set_sql = "UPDATE infoStructures \n"
             . "SET    is_parent_id = ?, \n"
             . "       is_level = ?, \n"
             . "       is_path = ? \n"
+            . "       is_sitecode = ? \n"
             . "WHERE  is_id = ?";
-        $this->HT->query($set_sql, array($set_parent_id, $set_level, $set_path, $is_id));
+        $this->HT->query($set_sql, array($set_parent_id, $set_level, $set_path,$set_is_sitecode, $is_id));
 
         $structure = $this->Detail($is_id);
 
@@ -250,14 +252,16 @@ class InfoStructures_model extends CI_Model
                 $structure = $this->Detail($item->is_parent_id);
             }
             $set_parent_id = $structure->is_id;
+            $set_is_sitecode = $structure->is_sitecode;
             $set_level = $structure->is_level + 1;
             $set_path = $structure->is_path . $item->is_id . ',';
             $set_sql = "UPDATE infoStructures \n"
                 . "SET    is_parent_id = ?, \n"
                 . "       is_level = ?, \n"
                 . "       is_path = ? \n"
+                . "       is_sitecode = ? \n"
                 . "WHERE  is_id = ?";
-            $this->HT->query($set_sql, array($set_parent_id, $set_level, $set_path, $item->is_id));
+            $this->HT->query($set_sql, array($set_parent_id, $set_level, $set_path,$set_is_sitecode, $item->is_id));
         }
     }