Selaa lähdekoodia

设备之系统——消息提醒 V3.6 BUG
润滑主表为空情况

hyq 1 vuosi sitten
vanhempi
commit
e19f28675f

+ 5 - 1
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -456,8 +456,12 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         if (maintenanceTaskDoList.size() + lubricationTaskManagementDoList.size() == 0) {
             return R.ok();
         }
+        List<EquLubricationTaskDetailDo> lubricationTaskDetailDoList = new ArrayList<>();
         List<String> lubricationIds = lubricationTaskManagementDoList.stream().map(EquLubricationTaskManagementDo::getId).collect(Collectors.toList());
-        List<EquLubricationTaskDetailDo> lubricationTaskDetailDoList = lubricationTaskDetailService.getDetailByMasterId(lubricationIds);
+        if (!lubricationIds.isEmpty()){
+            lubricationTaskDetailDoList = lubricationTaskDetailService.getDetailByMasterId(lubricationIds);
+        }
+
         // 删除提醒
         CXCommonUtils.deleteSendNotify(END_UNFINISHED_TASK, null);
         // 遍历三个工厂 分别给每个工厂发送提醒