From 4d7b6bbc0387ff0d7c6b8d2c422d4d0cc71a0253 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Mon, 7 Apr 2025 15:45:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9array=5Fto=5Ftree?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=89=80=E5=9C=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/common.php | 34 ----------------------------------
 app/common.php       | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/admin/common.php b/app/admin/common.php
index d555d576..0e40ab3f 100644
--- a/app/admin/common.php
+++ b/app/admin/common.php
@@ -1,40 +1,6 @@
 <?php
 // 这是系统自动生成的公共文件
 
-if (!function_exists('array_to_tree')) {
-    /**
-     * 数组转换为树状结构
-     * @param array $data 数据
-     * @param int $pid 父级ID
-     * @param string $with 转换依据字段
-     * @param int|bool $level 层级
-     * @param bool $keep_pid 是否保留pid
-     * @return array
-     */
-    function array_to_tree(array $data, int $pid, string $with = 'pid', int|bool $level = 1, bool $keep_pid = true)
-    {
-        $ret = [];
-        foreach ($data as $item) {
-            if ($item[$with] == $pid) {
-                $lv = $level;
-                if ($level !== false) {
-                    $item['level'] = $level;
-                    $lv            = $level + 1;
-                }
-                if ($keep_pid === false) {
-                    unset($item[$with]);
-                }
-                $children = array_to_tree($data, $item['id'], $with, $lv, $keep_pid);
-                if ($children) {
-                    $item['children'] = $children;
-                }
-                $ret[] = $item;
-            }
-        }
-        return $ret;
-    }
-}
-
 if (!function_exists('xlsx_reader')) {
     /**
      * 读取Excel数据
diff --git a/app/common.php b/app/common.php
index 5bd19fa0..ae91895a 100644
--- a/app/common.php
+++ b/app/common.php
@@ -68,4 +68,38 @@ if (!function_exists('random_str')) {
         }
         return $res;
     }
+}
+
+if (!function_exists('array_to_tree')) {
+    /**
+     * 数组转换为树状结构
+     * @param array $data 数据
+     * @param int $pid 父级ID
+     * @param string $with 转换依据字段
+     * @param int|bool $level 层级
+     * @param bool $keep_pid 是否保留pid
+     * @return array
+     */
+    function array_to_tree(array $data, int $pid, string $with = 'pid', int|bool $level = 1, bool $keep_pid = true)
+    {
+        $ret = [];
+        foreach ($data as $item) {
+            if ($item[$with] == $pid) {
+                $lv = $level;
+                if ($level !== false) {
+                    $item['level'] = $level;
+                    $lv            = $level + 1;
+                }
+                if ($keep_pid === false) {
+                    unset($item[$with]);
+                }
+                $children = array_to_tree($data, $item['id'], $with, $lv, $keep_pid);
+                if ($children) {
+                    $item['children'] = $children;
+                }
+                $ret[] = $item;
+            }
+        }
+        return $ret;
+    }
 }
\ No newline at end of file