diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php
index 856c83ee..26390faa 100644
--- a/src/admin/archives_do.php
+++ b/src/admin/archives_do.php
@@ -69,8 +69,7 @@ function viewArchives(){ }
 else if ($dopost == "viewArchives") {
     $aid = preg_replace("#[^0-9]#", '', $aid);
     //获取主表信息
-    $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,
-        tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl
+    $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl
         FROM `#@__arctiny` arc
         LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid
         LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype
diff --git a/src/admin/content_list.php b/src/admin/content_list.php
index 854a4b63..83483e19 100644
--- a/src/admin/content_list.php
+++ b/src/admin/content_list.php
@@ -141,8 +141,7 @@ if ($arcrank != '') {
 }
 $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby);
 $orderbyField = 'arc.'.$orderby;
-$query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,
-arc.channel,arc.arcrank,arc.click,arc.title,arc.color,arc.litpic,arc.pubdate,arc.mid
+$query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,arc.channel,arc.arcrank,arc.click,arc.title,arc.color,arc.litpic,arc.pubdate,arc.mid
 FROM `$maintable` arc
 $whereSql
 ORDER BY $orderbyField DESC";
diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php
index 5cfb21fa..dab1a69c 100755
--- a/src/system/archive/listview.class.php
+++ b/src/system/archive/listview.class.php
@@ -675,13 +675,12 @@ class ListView
         }
         //如果不用默认的sortrank或id排序，使用联合查询（数据量大时非常缓慢）
         if (preg_match('/hot|click|lastpost/', $orderby)) {
-            $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,
-           tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
-           $addField
-           FROM `#@__archives` arc
-           LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
-           $addJoin
-           WHERE {$this->addSql} $filtersql $ordersql LIMIT $limitstart,$row";
+            $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
+            $addField
+            FROM `#@__archives` arc
+            LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
+            $addJoin
+            WHERE {$this->addSql} $filtersql $ordersql LIMIT $limitstart,$row";
         }
         //普通情况先从arctiny表查出ID，然后按ID查询（速度非常快）
         else {
@@ -697,12 +696,11 @@ class ListView
             if ($idstr == '') {
                 return '';
             } else {
-                $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,
-                       tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
-                       $addField
-                       FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
-                       $addJoin
-                       WHERE arc.id in($idstr) $ordersql ";
+                $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
+                $addField
+                FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
+                $addJoin
+                WHERE arc.id in($idstr) $ordersql ";
             }
             $t2 = ExecTime();
             //echo $t2-$t1;
@@ -886,7 +884,9 @@ class ListView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>\r\n";
+                //$listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>\r\n";
+                $listdd .= "<li class='page-item'><a class='page-link' href='".$typedir."'>'.$j.'</a></li>\r\n";
+
             } else {
                 $listdd .= "<li class='page-item'><a class='page-link' href='".str_replace("{page}", $j, $tnamerule)."'>".$j."</a></li>\r\n";
             }
diff --git a/src/system/archive/rssview.class.php b/src/system/archive/rssview.class.php
index 60494cc0..292b39ec 100755
--- a/src/system/archive/rssview.class.php
+++ b/src/system/archive/rssview.class.php
@@ -128,8 +128,7 @@ class RssView
         $orwhere = " arc.arcrank > -1 ";
         $orwhere .= " AND (arc.typeid in (".GetSonIds($this->TypeID, $this->TypeFields['channeltype']).") ) ";
         $ordersql = " ORDER BY arc.id desc";
-        $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,
-        tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
+        $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
         FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
         WHERE $orwhere $ordersql LIMIT 0,".$this->MaxRow;
         $this->dsql->SetQuery($query);
diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php
index 5641e679..b46a2955 100755
--- a/src/system/archive/searchview.class.php
+++ b/src/system/archive/searchview.class.php
@@ -537,11 +537,9 @@ class SearchView
             }
         }
         //搜索
-        $query = "SELECT arc.*,act.typedir,act.typename,act.isdefault,act.defaultname,act.namerule,
-            act.namerule2,act.ispart,act.moresite,act.siteurl,act.sitepath
-            FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` act ON arc.typeid=act.id
-            WHERE {$this->AddSql} $ordersql LIMIT $limitstart,$row";
-
+        $query = "SELECT arc.*,act.typedir,act.typename,act.isdefault,act.defaultname,act.namerule,act.namerule2,act.ispart,act.moresite,act.siteurl,act.sitepath
+        FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` act ON arc.typeid=act.id
+        WHERE {$this->AddSql} $ordersql LIMIT $limitstart,$row";
         $this->dsql->SetQuery($query);
         $this->dsql->Execute("al");
         $artlist = "";
diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php
index 1ec81597..533f5c1a 100755
--- a/src/system/taglib/arclist.lib.php
+++ b/src/system/taglib/arclist.lib.php
@@ -275,8 +275,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
             $addfieldsSqlJoin = " LEFT JOIN `$addtable` addf ON addf.aid = arc.id ";
         }
     }
-    $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,
-        tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
+    $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
         $addfieldsSql
         FROM `$maintable` arc LEFT JOIN `#@__arctype` tp on arc.typeid=tp.id
         $addfieldsSqlJoin
diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php
index ef98367d..de0e4ec0 100644
--- a/src/system/taglib/relation.lib.php
+++ b/src/system/taglib/relation.lib.php
@@ -43,18 +43,16 @@ function lib_relation(&$ctag, &$refObj)
         $odb = " ORDER BY arc.click DESC";
     }
     if ($channelid > 0) {
-        $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,
-    tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
-    FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
-    where arc.arcrank>-1 AND arc.id IN (".$refObj->Fields[$name].") $odb";
+        $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
+        FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
+        where arc.arcrank>-1 AND arc.id IN (".$refObj->Fields[$name].") $odb";
     } else {
         $gquery = "SELECT addtable,listfields FROM `#@__channeltype` WHERE id='$channelid' ";
         $grow = $dsql->GetOne($gquery);
         $maintable = trim($grow['addtable']);
-        $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,
-    tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
-    FROM `{$maintable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
-    where arc.arcrank>-1 AND arc.aid IN (".$refObj->Fields[$name].") $odb";
+        $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath
+        FROM `{$maintable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id
+        where arc.arcrank>-1 AND arc.aid IN (".$refObj->Fields[$name].") $odb";
     }
     $innertext = trim($ctag->GetInnerText());
     if ($innertext == '') $innertext = GetSysTemplets('part_arclist.htm');
diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php
index adec09ad..df4849c3 100755
--- a/src/user/archives_edit.php
+++ b/src/user/archives_edit.php
@@ -24,8 +24,8 @@ function _ShowForm(){  }
 if (empty($dopost)) {
     //读取归档信息
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta
-       FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel
-       WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
+        FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel
+        WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
     $row = $dsql->GetOne($arcQuery);
     if (!is_array($row)) {
         ShowMsg("读取文档信息出错!", "-1");
diff --git a/src/user/article_edit.php b/src/user/article_edit.php
index 05236760..4ef59816 100755
--- a/src/user/article_edit.php
+++ b/src/user/article_edit.php
@@ -24,8 +24,8 @@ function _ShowForm(){  }
 if (empty($dopost)) {
     //读取归档信息
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta
-       FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel
-       WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
+        FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel
+        WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
     $row = $dsql->GetOne($arcQuery);
     if (!is_array($row)) {
         ShowMsg("读取文章信息出错!", "-1");