fix: 企标新增报错
This commit is contained in:
+7
-5
@@ -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<LinkedHashMap> checkList = (List<LinkedHashMap>) parameterMap.get(FieldCommon.CHECK_LIST);
|
||||
// List<EnterpriseStandardInspectContent> inspectContents = this.convertList(checkList);
|
||||
// parameterMap.put(FieldCommon.CHECK_LIST, null);
|
||||
List<LinkedHashMap> checkList = (List<LinkedHashMap>) parameterMap.get(FieldCommon.CHECK_LIST);
|
||||
if (null != checkList) {
|
||||
List<EnterpriseStandardInspectContent> inspectContents = this.convertList(checkList);
|
||||
parameterMap.put(FieldCommon.CHECK_LIST, null);
|
||||
}
|
||||
// 法规编号不能为空
|
||||
String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER);
|
||||
if (StringUtils.isBlank(standardNumber)) {
|
||||
|
||||
Reference in New Issue
Block a user