判断逻辑调整

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsCheckPlanServiceImpl.java

@@ -118,8 +118,8 @@ public class IsMaterialsCheckPlanServiceImpl extends ServiceImpl<IsMaterialsChec
                     .eq(IsMailSendTaskItem::getSendStatus, "0")
                     .eq(IsMailSendTaskItem::getIsCancelled, "0"));
             if (!notSendMails.isEmpty()) {
-                List<Long> notSendMailids = notSendMails.stream().map(IsMailSendTaskItem::getMailId).collect(Collectors.toList());
-                iIsMailSendTaskItemService.removeBatchByIds(notSendMailids);
+                List<Long> notSendMailIds = notSendMails.stream().map(IsMailSendTaskItem::getMailId).collect(Collectors.toList());
+                iIsMailSendTaskItemService.removeBatchByIds(notSendMailIds);
             }
         }
         // 4.3判断柜子是否激活，激活才有效

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsLoanServiceImpl.java

@@ -383,7 +383,7 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
             map.put("[发件人]", sendName);
             map.put("[公司名称]", company);
             // 2.3处理归还提醒
-            if (isMaterialsLoan.getReminderTime() != null) {
+            if (isMaterialsLoan.getReminderTime() != null && reminderConf != null && "1".equals(reminderConf.getStatus())) {
                 System.out.println("设置借用提醒邮件");
                 // 邮件实体
                 IsMailSendTaskItem taskItem = new IsMailSendTaskItem();
@@ -396,7 +396,7 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
                 iIsMailSendTaskItemService.insertIsMailSendTaskItem(taskItem, map);
             }
             // 2.4处理归还告警
-            if (isMaterialsLoan.getTimeoutAlarm() != null) {
+            if (isMaterialsLoan.getTimeoutAlarm() != null && alarmConf != null && "1".equals(alarmConf.getStatus())) {
                 System.out.println("设置借用告警邮件");
                 // 邮件实体
                 IsMailSendTaskItem taskItem = new IsMailSendTaskItem();