diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index 30a96536..96df2cc7 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -506,6 +506,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
      * @return
      */
     private AjaxResult formatEquItemCommon(List<EquPlanEqu> equPlanEquList, String planType, String message) {
+        String equipmentList = "";
         for (EquPlanEqu data : equPlanEquList) {
 
             // 检查项名称临时对象
@@ -552,10 +553,16 @@ public class EquPlanServiceImpl implements IEquPlanService {
                 data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称（用于前端信息回显）
             } else {
                 // 未查询到对应检查项信息
-                return error(500, message);
+                equipmentList = equipmentList + '[' + data.getEquipmentCode() + "]";
             }
         }
-        return success(equPlanEquList);
+        if(!equipmentList.equals("")){
+            equipmentList = equipmentList + "设备未查询到对应检查项信息!";
+            message = equipmentList;
+            return error(500, message);
+        }else{
+            return success(equPlanEquList);
+        }
     }
 
     /**
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
index a8a8661d..5917c45e 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
@@ -177,8 +177,9 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService {
             equipmentList = equipmentList + "设备未查询到对应检查项信息!";
             message = equipmentList;
             return error(500, message);
+        }else{
+            return success(equPlanEquList);
         }
-        return success(equPlanEquList);
     }
 
 }