Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop

谭毅彬
2 parents 43b13da2 f930ea23
Showing 1 changed file with 2 additions and 1 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/MaterialLevelAlarmTask.java
@@ -14,6 +14,7 @@ import org.jeecg.modules.wms.config.materialWarning.entity.MaterialLevelAlarm;
 import org.jeecg.modules.wms.config.materialWarning.service.impl.MaterialWarningServiceImpl;
 import org.quartz.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -60,7 +61,7 @@ public class MaterialLevelAlarmTask implements Job {
         log.info(StrUtil.format("定时任务 MaterialLevelAlarmTask 参数：{}，执行时间：{}", this.parameter, DateUtils.getTimestamp()));
         List<MaterialLevelAlarm> alarmList = materialWarningService.getLevelAlarm(null);
-        if (alarmList == null && alarmList.size() == 0) {
+        if (CollectionUtils.isEmpty(alarmList)) {
             return;
         }