From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 16 十月 2023 09:03:47 +0800 Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3 --- server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java index 04bbbb4..ff62915 100644 --- a/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java +++ b/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java @@ -275,8 +275,11 @@ for(int i=0;i<materialList.size();i++){ Integer counter=i+2; Material material=materialList.get(i); - if(StringUtils.isEmpty(material.getName())||StringUtils.isEmpty(material.getCode())||StringUtils.isEmpty(material.getUnitname()) - ||StringUtils.isEmpty(material.getFormationname())||StringUtils.isEmpty(material.getAttr()) + if(StringUtils.isEmpty(material.getName()) + ||StringUtils.isEmpty(material.getCode()) + ||StringUtils.isEmpty(material.getUnitname()) + ||StringUtils.isEmpty(material.getFormationname()) + ||StringUtils.isEmpty(material.getAttr()) ||StringUtils.isEmpty(material.getCateUnionName())){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "绗�"+counter+"琛岋細瀵煎叆鏁版嵁鍐呭涓嶈兘涓虹┖锛�"); -- Gitblit v1.9.3