From a020439a97a472f570951ee118031a429a54051d Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Tue, 11 Jul 2023 10:26:59 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=AD=A3=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MdPbClassstandardServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 queryClassById(Map whereJson) { QueryWrapper query = new QueryWrapper<>(); query.eq("1","1"); - if (ObjectUtil.isNotEmpty(whereJson.get("material_id"))) { - MdMeMaterialbase one = materialbaseService.getOne(new QueryWrapper().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().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")); }