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

@@ -279,10 +279,9 @@ class NavLogic extends  BaseLogic
         $navModel = new BNav();
         $navModel = new BNav();
         $sort = $sort + 1;
         $sort = $sort + 1;
         foreach ($subList as $k => $v){
         foreach ($subList as $k => $v){
+            $navModel->edit(['pid'=>$pid,'sort'=>$sort],['id'=>$v['id']]);
             if(!empty($v['sub'])){
             if(!empty($v['sub'])){
                 $this->subSort($v['sub'],$sort,$v['id']);
                 $this->subSort($v['sub'],$sort,$v['id']);
-            }else{
-                $navModel->edit(['pid'=>$pid,'sort'=>$sort],['id'=>$v['id']]);
             }
             }
         }
         }
         return true;
         return true;