简柏林 / thingskit · Commits

Commit 64b15ef8a371175705542d1602599073493dff11

Authored by xp.Huang
2 parents 9242811b 9a3ffc13

Merge branch 'cherry-pick-a0c81ec4' into 'master_dev' 

fix:解决组态引用模板入库报错

See merge request yunteng/thingskit!466
Inline Side-by-side
Showing 1 changed file with 1 additions and 0 deletions
@@ -105,6 +105,7 @@ public class TkConfigurationCenterServiceImpl @@ -105,6 +105,7 @@ public class TkConfigurationCenterServiceImpl
105 List<ConfigurationContentNodeDTO> nodeListCopyEntity = nodeService.selectByConfigurationId(templateId,configurationCenterDTO.getTenantId()); 105 List<ConfigurationContentNodeDTO> nodeListCopyEntity = nodeService.selectByConfigurationId(templateId,configurationCenterDTO.getTenantId());
106 if(nodeListCopyEntity!=null&&!nodeListCopyEntity.isEmpty()){ 106 if(nodeListCopyEntity!=null&&!nodeListCopyEntity.isEmpty()){
107 nodeListCopyEntity.forEach(nodeCopyEntity -> { 107 nodeListCopyEntity.forEach(nodeCopyEntity -> {
  108 + nodeCopyEntity.setId(null);
108 nodeCopyEntity.setConfigurationId(configurationCenter.getId()); 109 nodeCopyEntity.setConfigurationId(configurationCenter.getId());
109 JsonNode act = nodeCopyEntity.getActJson(); 110 JsonNode act = nodeCopyEntity.getActJson();
110 JsonNode event =nodeCopyEntity.getEventJson(); 111 JsonNode event =nodeCopyEntity.getEventJson();