Merge branch 'develop' of zhengxifeng/tyqngp into master

apps/home/model/SitemapModel.php

@@ -31,9 +31,14 @@ class SitemapModel extends Model
             'a.mcode=b.mcode',
             'LEFT'
         );
+        $where = [
+            'a.scode NOT IN(13,19,26)',
+            'a.pcode NOT IN(13,19,26)',
+        ];
         $result = parent::table('ay_content_sort a')->field($fields)
             ->where('a.status=1')
             ->where("a.acode='" . get_lg() . "'")
+            ->where($where)
             ->join($join)
             ->order('a.pcode,a.sorting,a.id')
             ->select();
@@ -50,6 +55,8 @@ class SitemapModel extends Model
             'c.type',
             'c.urlname',
             'b.scode',
+            'b.scode as bscode',
+            'b.pcode as bpcode',
             'b.filename as sortfilename'
         );
         $join = array(
@@ -64,13 +71,14 @@ class SitemapModel extends Model
                 'LEFT'
             )
         );
-        
+
         $where = array(
+            'b.scode NOT IN(13,19,26)',
+            'b.pcode NOT IN(13,19,26)',
             'a.status=1',
             'c.type=2',
             "a.date<'" . date('Y-m-d H:i:s') . "'"
         );
-        
         return parent::table('ay_content a')->field($fields)
             ->where("a.scode='$scode'")
             ->where($where)