diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
index 3749415b..caf02c2b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
@@ -116,10 +116,12 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl<MdPbClassstandardM
     public List<Map> queryClassById(Map whereJson) {
         QueryWrapper<MdPbClassstandard> query = new QueryWrapper<>();
         query.eq("1","1");
-        if (ObjectUtil.isNotEmpty(whereJson.get("material_id"))) {
-            MdMeMaterialbase one = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", whereJson.get("material_id")));
-            whereJson.put("class_idStr",one.getMaterial_type_id());
-        }
+         if(ObjectUtil.isNotEmpty(whereJson.get("material_id"))) {
+              MdMeMaterialbase one = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", whereJson.get("material_id")));
+              if(null != one) {
+                   whereJson.put("class_idStr", one.getMaterial_type_id());
+              }
+         }
         if (ObjectUtil.isNotEmpty(whereJson.get("whereStr"))) {
             query.last((String) whereJson.get("whereStr"));
         }