Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -121,7 +121,7 @@ class CategoryLogic extends  BaseLogic
      * @time   :2023/8/21 17:43
      * @time   :2023/8/21 17:43
      */
      */
     public function handleEditParam(&$param){
     public function handleEditParam(&$param){
-        $category_ids = Category::getChildIdsArr($param['id']);
+        $category_ids = Category::getChildIdsArr($param['id'] ?? 0);
         if(in_array($param['pid'], $category_ids)){
         if(in_array($param['pid'], $category_ids)){
             $this->fail('上级分类不能是本分类或子分类');
             $this->fail('上级分类不能是本分类或子分类');
         }
         }

@@ -31,6 +31,9 @@ class Category extends Base
      */
      */
     public static function getChildIdsArr($id)
     public static function getChildIdsArr($id)
     {
     {
+        if(!$id){
+            return [];
+        }
         $list = self::where('status', self::STATUS_ACTIVE)->select(['id','pid'])->get()->toArray();
         $list = self::where('status', self::STATUS_ACTIVE)->select(['id','pid'])->get()->toArray();
         $ids = [];
         $ids = [];
         Arr::findChildIds($list, $id, $ids);
         Arr::findChildIds($list, $id, $ids);

@@ -136,6 +136,7 @@ class ProjectServer extends BaseService
             <div class="layout" data-unable="demo01-error404">
             <div class="layout" data-unable="demo01-error404">
                 <img src="https://ecdn6.globalso.com/upload/m/image_other/2023-10/6528a87e594db30162.png" />
                 <img src="https://ecdn6.globalso.com/upload/m/image_other/2023-10/6528a87e594db30162.png" />
             </div>
             </div>
+            <p style="text-align: center">SORRY. THE PAGE HAS EITHER MOVED OR CANNOT BE FOUND.</p>
             <style>
             <style>
                 .section-block-error404 .layout {
                 .section-block-error404 .layout {
                     height: 700px;
                     height: 700px;
@@ -155,7 +156,7 @@ class ProjectServer extends BaseService
             <script>
             <script>
             </script>
             </script>
         </section>
         </section>
-    </main>', 'html_style' => '<style id="globalsojs-styles"></style>','created_at' => $created_at, 'updated_at' => $created_at];
+    </main>', 'html_style' => '<style id="globalsojs-styles"></style>','title' => '404-Page not found', 'description' => 'Sorry. The page has either moved or cannot be found.', 'created_at' => $created_at, 'updated_at' => $created_at];
             $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
             $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
             //路由
             //路由
             $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
             $info = DB::connection('custom_mysql')->table('gl_route_map')->first();