Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/framework/task/TSpecdevAllTask.java

@@ -111,7 +111,6 @@ public class TSpecdevAllTask extends BaseController {
                 t.setPrincipalEmail(user.getEmail());
             }
         }
-        userList.add(tAlarmPrincipal);
         for (TAlarmPrincipal o : userList) {
             //根据装置权限获取数据
             List<SysPlant> plantList = sysPlantService.selectSysPlantByDeptId(o.getDeptId());
@@ -394,7 +393,6 @@ public class TSpecdevAllTask extends BaseController {
     }
 
     private void checkWarnFlagForDt(Long firstlevel, Long secondlevel, Long thirdlevel, SimpleDateFormat sdf) {
-
         //获取需要发送邮件的人员信息
         TAlarmPrincipal tAlarmPrincipal = new TAlarmPrincipal();
         tAlarmPrincipal.setTypeId(this.alarmtype);
@@ -479,9 +477,9 @@ public class TSpecdevAllTask extends BaseController {
      */
     private void dtSendEmail(SimpleDateFormat sdf, List<TSpecdevDt> dt, TAlarmPrincipal o, String warningContent, String level) {
         if (dt.size() > 0) {
-            this.sendEmail(o.getPrincipalName(), o.getPrincipalEmail(), this.glAlarmType, level,
-                    this.contentFormat, this.dtWarningContent(dt, sdf), this.glUrlSuffix);
-            insertHistory(o, level.substring(0, 1), warningContent, this.alarmtype + "", this.glAlarmType);
+            this.sendEmail(o.getPrincipalName(), o.getPrincipalEmail(), this.dtAlarmType, level,
+                    this.contentFormat, this.dtWarningContent(dt, sdf), this.dtUrlSuffix);
+            insertHistory(o, level.substring(0, 1), warningContent, this.alarmtype + "", this.dtAlarmType);
         }
     }