合并分支 'lyh-server' 到 'master'

gxai



查看合并请求 !1891

@@ -859,15 +859,14 @@ function getRouteMap($source,$source_id,$is_upgrade = 0){
         if($is_upgrade == 1){
             if($source == $routeMapModel::SOURCE_NEWS_CATE){
                 if($info['route'] != 'news'){
-                    $route = $routeMapModel::PATH_NEWS_CATE.'/'.$info['route'];
+                    return $routeMapModel::PATH_NEWS_CATE.'/'.$info['route'];
                 }
             }elseif ($source == $routeMapModel::SOURCE_BLOG_CATE){
                 if($info['route'] != 'blog'){
-                    $route = $routeMapModel::PATH_BLOG_CATE.'/'.$info['route'];
+                    return $routeMapModel::PATH_BLOG_CATE.'/'.$info['route'];
                 }
-            }else{
-                $route = $info['route'];
             }
+            $route = $info['route'];
             return $route;
         }
         if(!empty($info['path'])){