Merge branch 'master' of github.com:easysoft/zentaopms

module/doc/css/common.css

@@ -75,3 +75,5 @@ td.c-name a:visited{color: #082999}
 .panel-title.font-normal .btn-group{margin-left: 20px;}
 
 .querybox-opened{color: #0c64eb; background: rgba(0,0,0,.075);}
+
+#queryBox #groupAndOr {min-width: 65px;}

module/tree/model.php

@@ -1643,7 +1643,7 @@ class treeModel extends model
      */
     public function getDocStructure()
     {
-        $stmt = $this->dbh->query($this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('doc')->andWhere('deleted')->eq(0)->orderBy('id_desc')->get());
+        $stmt = $this->dbh->query($this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('doc')->andWhere('deleted')->eq(0)->orderBy('`order`')->get());
         $parent = array();
         while($module = $stmt->fetch())
         {