From 7f396fb2fc774c4b1c0885320fc931118018a922 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Sep 2023 13:42:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/LawsCommonServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index f14cb7ea..706ea69b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -494,8 +494,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { String module = (String) parameterMap.get(FieldCommon.MODULE); // 企标需要自动拼装标准号 - if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue()) && - StrUtil.isBlank(parameterMap.get(FieldCommon.STANDARD_NUMBER).toString())) { + if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue()) + && null == parameterMap.get(FieldCommon.STANDARD_NUMBER)) { // 生成企标编号 String standardNumber = esUtil.generateStandardNumber(parameterMap); parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); @@ -507,9 +507,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { setStandardNumber(parameterMap); } // 提前处理企标的稽查内容，否则后面转换会报错 -// List checkList = (List) parameterMap.get(FieldCommon.CHECK_LIST); -// List inspectContents = this.convertList(checkList); -// parameterMap.put(FieldCommon.CHECK_LIST, null); + List checkList = (List) parameterMap.get(FieldCommon.CHECK_LIST); + if (null != checkList) { + List inspectContents = this.convertList(checkList); + parameterMap.put(FieldCommon.CHECK_LIST, null); + } // 法规编号不能为空 String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER); if (StringUtils.isBlank(standardNumber)) {