Browse Source

sql order bug

star7th 5 years ago
parent
commit
88c089cdf8

+ 1 - 1
server/Application/Api/Controller/CatalogController.class.php

@@ -258,7 +258,7 @@ class CatalogController extends BaseController {
             $this->sendError(10103);
             return ;
         }
-        $return = D("Page")->where("cat_id = '$cat_id' and  item_id = '$item_id' and is_del = 0  ")->field("page_id , page_title,s_number")->order("`s_number` asc , `page_id` asc")->select();
+        $return = D("Page")->where("cat_id = '$cat_id' and  item_id = '$item_id' and is_del = 0  ")->field("page_id , page_title,s_number")->order("s_number asc , page_id asc")->select();
         $this->sendResult($return);
 
     }

+ 1 - 1
server/Application/Api/Controller/ItemController.class.php

@@ -58,7 +58,7 @@ class ItemController extends BaseController {
         if ($keyword) {
             $keyword = strtolower ($keyword) ;
             $keyword = \SQLite3::escapeString($keyword) ;
-            $pages = D("Page")->where("item_id = '$item_id' and is_del = 0  and ( lower(page_title) like '%{$keyword}%' or lower(page_content) like '%{$keyword}%' ) ")->order(" `s_number` asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
+            $pages = D("Page")->where("item_id = '$item_id' and is_del = 0  and ( lower(page_title) like '%{$keyword}%' or lower(page_content) like '%{$keyword}%' ) ")->order(" s_number asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
             $menu['pages'] = $pages ? $pages : array();
         }else{
             $menu = D("Item")->getMemu($item_id) ;

+ 2 - 2
server/Application/Api/Model/ItemModel.class.php

@@ -143,7 +143,7 @@ class ItemModel extends BaseModel {
 
     public function getContent($item_id , $page_field ="*" , $catalog_field ="*" , $uncompress = 0 ){
             //获取所有父目录id为0的页面
-            $all_pages = D("Page")->where("item_id = '$item_id' and is_del = 0 ")->order(" `s_number` asc , `page_id` asc  ")->field($page_field)->select();
+            $all_pages = D("Page")->where("item_id = '$item_id' and is_del = 0 ")->order(" s_number asc , page_id asc  ")->field($page_field)->select();
             $pages = array() ;
             if ($all_pages) {
                 foreach ($all_pages as $key => $value) {
@@ -156,7 +156,7 @@ class ItemModel extends BaseModel {
             }
             
             //获取该项目下的所有目录
-            $all_catalogs = D("Catalog")->field($catalog_field)->where("item_id = '$item_id' ")->order(" `s_number` asc , `cat_id` asc ")->select();
+            $all_catalogs = D("Catalog")->field($catalog_field)->where("item_id = '$item_id' ")->order(" s_number asc , cat_id asc ")->select();
 
             //获取所有二级目录
             $catalogs = array() ;

+ 6 - 6
server/Application/Home/Controller/ItemController.class.php

@@ -98,27 +98,27 @@ class ItemController extends BaseController {
         //是否有搜索词
         if ($keyword) {
             $keyword = \SQLite3::escapeString($keyword) ;
-            $pages = D("Page")->where("item_id = '$item_id' and ( page_title like '%{$keyword}%' or page_content like '%{$keyword}%' ) ")->order(" `s_number` asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
+            $pages = D("Page")->where("item_id = '$item_id' and ( page_title like '%{$keyword}%' or page_content like '%{$keyword}%' ) ")->order(" s_number asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
         
         }else{
             //获取所有父目录id为0的页面
-            $pages = D("Page")->where("cat_id = '0' and item_id = '$item_id' ")->order(" `s_number` asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
+            $pages = D("Page")->where("cat_id = '0' and item_id = '$item_id' ")->order(" s_number asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
             //获取所有二级目录
-            $catalogs = D("Catalog")->where("item_id = '$item_id' and level = 2  ")->order(" `s_number` asc  ")->select();
+            $catalogs = D("Catalog")->where("item_id = '$item_id' and level = 2  ")->order(" s_number asc  ")->select();
             if ($catalogs) {
                 foreach ($catalogs as $key => &$catalog) {
                     //该二级目录下的所有子页面
-                    $temp = D("Page")->where("cat_id = '$catalog[cat_id]' ")->order(" `s_number` asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
+                    $temp = D("Page")->where("cat_id = '$catalog[cat_id]' ")->order(" s_number asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
                     $catalog['pages'] = $temp ? $temp: array();
 
                     //该二级目录下的所有子目录
-                    $temp = D("catalog")->where("parent_cat_id = '$catalog[cat_id]' ")->order(" `s_number` asc  ")->select();
+                    $temp = D("catalog")->where("parent_cat_id = '$catalog[cat_id]' ")->order(" s_number asc  ")->select();
                     $catalog['catalogs'] = $temp ? $temp: array();
                     if($catalog['catalogs']){
                         //获取所有三级目录的子页面
                         foreach ($catalog['catalogs'] as $key3 => &$catalog3) {
                             //该二级目录下的所有子页面
-                            $temp = D("Page")->where("cat_id = '$catalog3[cat_id]' ")->order(" `s_number` asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
+                            $temp = D("Page")->where("cat_id = '$catalog3[cat_id]' ")->order(" s_number asc  ")->field("page_id,author_uid,cat_id,page_title,addtime")->select();
                             $catalog3['pages'] = $temp ? $temp: array();
                         }                        
                     }               

+ 5 - 5
server/Application/Home/Model/ItemModel.class.php

@@ -7,22 +7,22 @@ class ItemModel extends BaseModel {
     public function export($item_id){
         $item = D("Item")->where("item_id = '$item_id' ")->field(" item_type, item_name ,item_description,password ")->find();
         //获取所有父目录id为0的页面
-        $pages = D("Page")->where("cat_id = '0' and item_id = '$item_id' ")->field(" page_title ,page_content,s_number,page_comments ")->order(" `s_number` asc  ")->select();
+        $pages = D("Page")->where("cat_id = '0' and item_id = '$item_id' ")->field(" page_title ,page_content,s_number,page_comments ")->order(" s_number asc  ")->select();
         //获取所有二级目录
-        $catalogs = D("Catalog")->where("item_id = '$item_id' and level = 2  ")->field("cat_id, cat_name ,level,s_number ")->order(" `s_number` asc  ")->select();
+        $catalogs = D("Catalog")->where("item_id = '$item_id' and level = 2  ")->field("cat_id, cat_name ,level,s_number ")->order(" s_number asc  ")->select();
         if ($catalogs) {
             foreach ($catalogs as $key => &$catalog) {
                 //该二级目录下的所有子页面
-                $temp = D("Page")->where("cat_id = '$catalog[cat_id]' ")->field(" page_title ,page_content,s_number,page_comments ")->order(" `s_number` asc  ")->select();
+                $temp = D("Page")->where("cat_id = '$catalog[cat_id]' ")->field(" page_title ,page_content,s_number,page_comments ")->order(" s_number asc  ")->select();
                 $catalog['pages'] = $temp ? $temp: array();
                 //该二级目录下的所有子目录
-                $temp = D("catalog")->where("parent_cat_id = '$catalog[cat_id]' ")->field(" cat_id,cat_name ,level,s_number ")->order(" `s_number` asc  ")->select();
+                $temp = D("catalog")->where("parent_cat_id = '$catalog[cat_id]' ")->field(" cat_id,cat_name ,level,s_number ")->order(" s_number asc  ")->select();
                 $catalog['catalogs'] = $temp ? $temp: array();
                 if($catalog['catalogs']){
                     //获取所有三级目录的子页面
                     foreach ($catalog['catalogs'] as $key3 => &$catalog3) {
                         //该二级目录下的所有子页面
-                        $temp = D("Page")->where("cat_id = '$catalog3[cat_id]' ")->field(" page_title ,page_content,s_number,page_comments ")->order(" `s_number` asc  ")->select();
+                        $temp = D("Page")->where("cat_id = '$catalog3[cat_id]' ")->field(" page_title ,page_content,s_number,page_comments ")->order(" s_number asc  ")->select();
                         $catalog3['pages'] = $temp ? $temp: array();
                         unset($catalog3['cat_id']);
                     }