diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index 326e68269..9e189d2cb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -67,21 +67,23 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { // 插入子表 List createReqVOElements = createReqVO.getElements(); - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelTemplateId(labelTemplate.getId()); - LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); - labelElementTemplateMapper.insert(elementTemplateDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO); - }); - //插入索引 - try { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); + if(CollectionUtil.isNotEmpty(createReqVOElements)) { + List labelElementPropertyDOS = new ArrayList<>(); + createReqVOElements.forEach(e -> { + e.setLabelTemplateId(labelTemplate.getId()); + LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); + labelElementTemplateMapper.insert(elementTemplateDO); + LabelElementPropertyDO propertyDO = e.getPropertyDO(); + propertyDO.setElementId(elementTemplateDO.getId()); + labelElementPropertyDOS.add(propertyDO); + }); + //插入索引 + try { + esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); + } catch (Exception e) { + log.error(e.getMessage()); + throw exception(INTERNAL_SERVER_ERROR); + } } // 返回 return labelTemplate.getId(); @@ -126,7 +128,9 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { }); //插入索引 try { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); + if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { + esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); + } if(!Objects.isNull(builder)) { elasticsearchClient.deleteByQuery(builder.build()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 9cf417c56..b7cc29423 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -67,21 +67,23 @@ public class LabelServiceImpl implements LabelService { // 插入子表 List createReqVOElements = createReqVO.getElements(); - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelId(Label.getId()); - LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); - labelElementMapper.insert(elementDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementDO.getId()); - labelElementPropertyDOS.add(propertyDO); - }); - //插入索引 - try { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); + if(CollectionUtil.isNotEmpty(createReqVOElements)) { + List labelElementPropertyDOS = new ArrayList<>(); + createReqVOElements.forEach(e -> { + e.setLabelId(Label.getId()); + LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); + labelElementMapper.insert(elementDO); + LabelElementPropertyDO propertyDO = e.getPropertyDO(); + propertyDO.setElementId(elementDO.getId()); + labelElementPropertyDOS.add(propertyDO); + }); + //插入索引 + try { + esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); + } catch (Exception e) { + log.error(e.getMessage()); + throw exception(INTERNAL_SERVER_ERROR); + } } // 返回 return Label.getId(); @@ -126,7 +128,9 @@ public class LabelServiceImpl implements LabelService { }); //插入索引 try { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); + if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { + esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); + } if(!Objects.isNull(builder)) { elasticsearchClient.deleteByQuery(builder.build()); }