AlarmPushConfig 禁用的不推送

api/app/lib/controllers/push/config.js

@@ -19,6 +19,7 @@ async function list (ctx) {
          where: {
             del: false
          },
+         order: [['id', 'desc']],
          include: [{
             model: models.ProjectCorrelation,
             where: projectCorrelationWhere,

api/app/lib/schedule/alarms_push.js

@@ -16,13 +16,14 @@ module.exports = function (app, opts) {
             const curMinOfYear = moment().diff(moment().startOf('year'), 'minutes')
             const configListRes = await models.AlarmPushConfig.findAll({
                where: {
-                  del: false
+                  del: false,
+                  disable: false
                },
                order: ['id'],
                include: [{
                   model: models.ProjectCorrelation,
                   where: {
-                     del: false
+                     del: false,
                   },
                   required: true
                }],