Merge pull request #11 from TaleLin/dev

fix:修复分页的offset小bug

Author: pedro

app/dao/admin.js

@@ -28,12 +28,12 @@ class AdminDao {
             id: groupId,
             admin: UserAdmin.COMMON,
             count: count1,
-            start: start
+            start: start * count1
           }
           : {
             admin: UserAdmin.COMMON,
             count: count1,
-            start: start
+            start: start * count1
           },
         type: db.QueryTypes.SELECT
       }
@@ -128,7 +128,7 @@ class AdminDao {
       {
         replacements: {
           count: count1,
-          start: start
+          start: start * count1
         },
         type: db.QueryTypes.SELECT
       }

app/dao/log.js

@@ -18,7 +18,7 @@ class LogDao {
       });
     let { rows, count } = await Log.findAndCountAll({
       where: Object.assign({}, condition),
-      offset: start,
+      offset: start * count1,
       limit: count1,
       order: [["time", "DESC"]]
     });
@@ -44,7 +44,7 @@ class LogDao {
           [Sequelize.Op.like]: `%${keyword}%`
         }
       }),
-      offset: start,
+      offset: start * count1,
       limit: count1,
       order: [["time", "DESC"]]
     });
@@ -59,7 +59,7 @@ class LogDao {
       "SELECT lin_log.user_name AS names FROM lin_log GROUP BY lin_log.user_name HAVING COUNT(lin_log.user_name)>0 limit :count offset :start",
       {
         replacements: {
-          start: start,
+          start: start * count,
           count: count
         }
       }

app/plugins/notify/app/message-dao.js

@@ -21,7 +21,7 @@ class MessageDao {
         user_id: currentUser.id
       },
       limit: count1,
-      offset: start
+      offset: start * count1
     });
     return {
       rows,