From c6acf648b8bcee16df04dcc26e146c5d2dfb00b4 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 08 七月 2025 11:54:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/PcAppRunScanJob.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/PcAppRunScanJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/PcAppRunScanJob.java index d427424..6b299a6 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/PcAppRunScanJob.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/PcAppRunScanJob.java @@ -68,6 +68,9 @@ if (pcAppRunRealDataList != null && !pcAppRunRealDataList.isEmpty()) { for (PcAppRunRealData pcAppRunRealData : pcAppRunRealDataList) { MdcProduction mdcProduction = mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getProductionName, pcAppRunRealData.getMachineid())); + if (mdcProduction == null) { + continue; + } Integer oporation = pcAppRunRealData.getOporation(); Date collectTime = pcAppRunRealData.getCollecttime(); long second = DateUtils.differentSecond(collectTime, DateUtils.getNow()); -- Gitblit v1.9.3