From 8818497cb109738f4b742e19b484460e3e29e234 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 6 Mar 2026 13:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuBizSuppliersMaterialInfoController.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersMaterialInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersMaterialInfoController.java index 9c113c3..3df80c0 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersMaterialInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersMaterialInfoController.java @@ -7,6 +7,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -199,10 +201,22 @@ public class NuBizSuppliersMaterialInfoController extends JeecgController implist = new ArrayList<>(); for(int i=0;i queryWrapper = new QueryWrapper<>(); + if(StringUtils.isBlank(list.get(i).getMaterialName()) || StringUtils.isBlank(list.get(i).getSuppliersId())){ + continue; + } queryWrapper.eq("suppliers_id",list.get(i).getSuppliersId()); queryWrapper.eq("material_name",list.get(i).getMaterialName()); - queryWrapper.eq("specification_model",list.get(i).getSpecificationModel()); - queryWrapper.eq("brand_type",list.get(i).getBrandType()); + if(StringUtils.isBlank(list.get(i).getSpecificationModel())){ + queryWrapper.isNull("specification_model"); + }else{ + queryWrapper.eq("specification_model",list.get(i).getSpecificationModel()); + } + if(StringUtils.isBlank(list.get(i).getBrandType())){ + queryWrapper.isNull("brand_type"); + }else{ + queryWrapper.eq("brand_type",list.get(i).getBrandType()); + } + queryWrapper.last("limit 1"); NuBizSuppliersMaterialInfo a = nuBizSuppliersMaterialInfoService.getOne(queryWrapper); if(a==null){ implist.add(list.get(i));