Commit e376afcf authored by wujipeng's avatar wujipeng
Browse files

优化

parent 4a02406e
...@@ -78,10 +78,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -78,10 +78,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId()); handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId());
//处理模板详情复合 //处理模板详情复合
List<TemplateDetailMergeEntity> merges = templateDTO.getMerges(); List<TemplateDetailMergeEntity> merges = templateDTO.getMerges();
if (!ObjectUtils.isEmpty(merges)) {
for (TemplateDetailMergeEntity merge : merges) { for (TemplateDetailMergeEntity merge : merges) {
merge.setTemplateId(templateDTO.getId()); merge.setTemplateId(templateDTO.getId());
} }
if (!ObjectUtils.isEmpty(merges)) {
templateDetailMergeService.saveOrUpdateBatch(merges); templateDetailMergeService.saveOrUpdateBatch(merges);
} }
//处理模板详情行列配置 //处理模板详情行列配置
...@@ -94,10 +94,12 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -94,10 +94,12 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
if (!ObjectUtils.isEmpty(columns)) { if (!ObjectUtils.isEmpty(columns)) {
templateConfigList.addAll(columns.values()); templateConfigList.addAll(columns.values());
} }
if (!ObjectUtils.isEmpty(templateConfigList)) {
for (TemplateConfigEntity templateConfigEntity : templateConfigList) { for (TemplateConfigEntity templateConfigEntity : templateConfigList) {
templateConfigEntity.setTemplateId(templateDTO.getId()); templateConfigEntity.setTemplateId(templateDTO.getId());
} }
templateConfigService.saveOrUpdateBatch(templateConfigList); templateConfigService.saveOrUpdateBatch(templateConfigList);
}
return Boolean.TRUE; return Boolean.TRUE;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment