diff --git a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
index bb0e181..151d461 100644
--- a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
+++ b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
@@ -280,34 +280,41 @@ public class CraftsService extends ServiceImpl<CraftsMapper, Crafts> {
         if (voList != null && !voList.isEmpty()) {
             voList.forEach(craftMonitor -> {
                 Crafts crafts = this.getById(craftMonitor.getCraftsId());
-                Ores ores = oresService.getById(crafts.getOresId());
-                CraftMonitorVO vo = new CraftMonitorVO();
-                vo.setMonitorId(craftMonitor.getId());
-                vo.setCraftsId(crafts.getId());
-                vo.setCraftsName(crafts.getName());
-                vo.setOresId(ores.getId());
-                vo.setOresName(ores.getName());
-                vo.setSteps(JSONUtil.parseArray(crafts.getSteps()).toList(CraftsStep.class));
-                vo.setCurrentStepIndex(craftMonitor.getCurrentStepId());
-                vo.setCurrentStepResult(craftMonitor.getCurrentStepResult());
-                vo.setHeatId(craftMonitor.getHeatId());
-                vo.setColumns(JSONUtil.parseArray(craftMonitor.getColumns()).toList(Integer.class));
-                craftMonitorVOList.add(vo);
+                if (crafts != null) {
+                    Ores ores = oresService.getById(crafts.getOresId());
+                    CraftMonitorVO vo = new CraftMonitorVO();
+                    vo.setMonitorId(craftMonitor.getId());
+                    vo.setCraftsId(crafts.getId());
+                    vo.setCraftsName(crafts.getName());
+                    vo.setOresId(ores.getId());
+                    vo.setOresName(ores.getName());
+                    vo.setSteps(JSONUtil.parseArray(crafts.getSteps()).toList(CraftsStep.class));
+                    vo.setCurrentStepIndex(craftMonitor.getCurrentStepId());
+                    vo.setCurrentStepResult(craftMonitor.getCurrentStepResult());
+                    vo.setHeatId(craftMonitor.getHeatId());
+                    vo.setColumns(JSONUtil.parseArray(craftMonitor.getColumns()).toList(Integer.class));
+                    craftMonitorVOList.add(vo);
+                } else {
+                    craftMonitorService.removeById(craftMonitor.getId());
+                }
+
             });
         }
         return craftMonitorVOList;
     }
+
     /*
-    * 根据更新时间获取最后一条记录
-    * */
+     * 根据更新时间获取最后一条记录
+     * */
     public CraftMonitor getOneOrderByTime() {
         return craftMonitorService.getOne(new QueryWrapper<CraftMonitor>().orderByDesc("update_time").last("limit 1"));
     }
+
     /*
      * 删除所有工艺监控记录
      * */
     public void removeAllMonitor() {
-         craftMonitorService.remove(new QueryWrapper<>());
+        craftMonitorService.remove(new QueryWrapper<>());
     }
 
     public void removeMonitor(Long id) {