commit

@@ -11,7 +11,7 @@ const y100 = {
      * @param next
      * @param next
      */
      */
     async y100List(req, res, next) {
     async y100List(req, res, next) {
-        const {actId, pageNo = 1, pageSize = 10, tag = ''} = req.query;
+        const {actId, pageNo = 1, pageSize = 10, tag = '', top = true} = req.query;
 
 
         if (!actId) {
         if (!actId) {
             return res.json({
             return res.json({
@@ -25,7 +25,8 @@ const y100 = {
                 actId,
                 actId,
                 pageNo,
                 pageNo,
                 pageSize,
                 pageSize,
-                tag
+                tag,
+                top
             });
             });
     
     
             return res.json({
             return res.json({

@@ -16,7 +16,7 @@ class Y100Model extends global.yoho.BaseModel {
      * 获取Y100列表
      * 获取Y100列表
      * @returns {*}
      * @returns {*}
      */
      */
-    articleY100List({actId, pageNo, pageSize, tag}) {
+    articleY100List({actId, pageNo, pageSize, tag, top}) {
         const params = {
         const params = {
             actId,
             actId,
             start: (pageNo - 1) * pageSize,
             start: (pageNo - 1) * pageSize,
@@ -36,13 +36,15 @@ class Y100Model extends global.yoho.BaseModel {
         if (tag) {
         if (tag) {
             sql += ' and AAY.tag like :tag';
             sql += ' and AAY.tag like :tag';
             params.tag = `%${tag}%`;
             params.tag = `%${tag}%`;
-            sql += ' ORDER BY AA.good_count DESC';
+            
+        }
+        if (top) {
+            sql += ' ORDER BY AAY.top DESC,AA.create_time DESC';
         } else {
         } else {
-            sql += ' and AAY.top = 1';
+            sql += ' ORDER BY AA.good_count DESC';
         }
         }
         sql += ' LIMIT :start, :page';
         sql += ' LIMIT :start, :page';
         
         
-
         return mysqlCli.query(sql, params);
         return mysqlCli.query(sql, params);
     }
     }