gx

@@ -34,7 +34,11 @@ class BlogLogic extends BaseLogic
         try {
             $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
+                $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
+                $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
+                if($is_upgrade == 0 || $six_read == 1){
+                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
+                }
                 $route = $this->param['url'];
                 $this->edit($this->param,['id'=>$this->param['id']]);
             }else{

@@ -150,6 +150,7 @@ class CustomModuleCategoryLogic extends BaseLogic
      * @time   :2023/12/5 10:55
      */
     public function categoryEdit(){
+
         $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE,
             $this->param['id'], $this->user['project_id']);
         $this->editRoute($this->param['id'],$route);

@@ -186,9 +186,12 @@ class CustomModuleContentLogic extends BaseLogic
      * @time   :2023/12/7 15:04
      */
     public function contentEdit(){
-        $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,
-            $this->param['id'], $this->user['project_id']);
-        $this->editRoute($this->param['id'],$route);
+        $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
+        $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
+        if($is_upgrade == 0 || $six_read == 1) {
+            $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE, $this->param['id'], $this->user['project_id']);
+        }
+        $this->editRoute($this->param['id'],$this->param['route']);
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
             $this->fail('系统错误，请连续管理员');

@@ -64,7 +64,11 @@ class NewsLogic extends BaseLogic
         try {
             $this->param = $this->paramProcessing($this->param);
             if (isset($this->param['id']) && !empty($this->param['id'])) {
-                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
+                $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
+                $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
+                if($is_upgrade == 0 || $six_read == 1) {
+                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
+                }
                 //是否更新路由
                 $route = $this->param['url'];
                 $this->edit($this->param, ['id' => $this->param['id']]);

@@ -46,7 +46,11 @@ class ProductLogic extends  BaseLogic
         $this->param = $this->handleSaveParam($this->param);
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id'],$this->param['six_read'] ?? 1);
+                $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1:6.0数据
+                $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
+                if($is_upgrade == 0 || $six_read == 1){
+                    $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
+                }
                 $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];

@@ -111,10 +111,7 @@ class RouteMap extends Base
      * @author zbj
      * @date 2023/4/17
      */
-    public static function setRoute($title, $source, $source_id, $project_id = 0,$is_upgrade = 0){
-        if($is_upgrade != 0){//5.0数据编辑路由时，直接返回路由
-            return $title;
-        }
+    public static function setRoute($title, $source, $source_id, $project_id = 0){
         $route = self::generateRoute($title, $source, $source_id, $project_id);
         if(!$route){
             throw new \Exception('路由生成失败');