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

@@ -329,7 +329,7 @@ class BlogCategoryLogic extends BaseLogic
 
 
         $cate_arr = explode('/',$category);
         $cate_arr = explode('/',$category);
         $p_cate = $cate_arr[0];
         $p_cate = $cate_arr[0];
-        $c_cate = $cate_arr[1];
+        $c_cate = $cate_arr[1]??'';
 
 
         $p_category = $this->model->read(['name'=>$p_cate,'pid'=>0]);
         $p_category = $this->model->read(['name'=>$p_cate,'pid'=>0]);
         if(!$p_category){
         if(!$p_category){

@@ -295,7 +295,7 @@ class BlogLogic extends BaseLogic
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由
-            $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
+            $route = RouteMap::setRoute($data[1] ?: $data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
             $this->edit(['url' => $route], ['id' => $id]);
             $this->edit(['url' => $route], ['id' => $id]);
 
 
             return true;
             return true;

@@ -311,7 +311,7 @@ class NewsCategoryLogic extends BaseLogic
 
 
         $cate_arr = explode('/',$category);
         $cate_arr = explode('/',$category);
         $p_cate = $cate_arr[0];
         $p_cate = $cate_arr[0];
-        $c_cate = $cate_arr[1];
+        $c_cate = $cate_arr[1]??'';
 
 
         $p_category = $this->model->read(['name'=>$p_cate,'pid'=>0]);
         $p_category = $this->model->read(['name'=>$p_cate,'pid'=>0]);
         if(!$p_category){
         if(!$p_category){

@@ -331,7 +331,7 @@ class NewsLogic extends BaseLogic
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由
-            $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
+            $route = RouteMap::setRoute($data[1] ?: $data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
             $this->edit(['url' => $route], ['id' => $id]);
             $this->edit(['url' => $route], ['id' => $id]);
 
 
             return true;
             return true;

@@ -294,7 +294,7 @@ class CategoryLogic extends  BaseLogic
 
 
         $cate_arr = explode('/',$category);
         $cate_arr = explode('/',$category);
         $p_cate = $cate_arr[0];
         $p_cate = $cate_arr[0];
-        $c_cate = $cate_arr[1];
+        $c_cate = $cate_arr[1]??'';
 
 
         $p_category = $this->model->read(['title'=>$p_cate,'pid'=>0]);
         $p_category = $this->model->read(['title'=>$p_cate,'pid'=>0]);
         if(!$p_category){
         if(!$p_category){

@@ -549,7 +549,7 @@ class ProductLogic extends  BaseLogic
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由
-            $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
+            $route = RouteMap::setRoute($data[1] ?: $data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
             $this->edit(['route' => $route], ['id' => $id]);
             $this->edit(['route' => $route], ['id' => $id]);
 
 
             return true;
             return true;