|
@@ -448,16 +448,25 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
|
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydscdjAttachmentNameEnum.NAME_3,nodeAttachment);
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydscdjAttachmentNameEnum.NAME_3,nodeAttachment);
|
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydscdjAttachmentNameEnum.NAME_4,nodeAttachment);
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydscdjAttachmentNameEnum.NAME_4,nodeAttachment);
|
|
|
} else if(AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
} else if(AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,JsydghxkAttachmentNameEnum.NAME_3,nodeAttachment);
|
|
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,JsydghxkAttachmentNameEnum.NAME_4,nodeAttachment);
|
|
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,JsydghxkAttachmentNameEnum.NAME_5,nodeAttachment);
|
|
|
|
|
|
|
+ String sourceId = projectMapper.getNodeSourceIdByTable(nodeId,nodeTableName);
|
|
|
|
|
+ if(StringUtils.isBlank(sourceId)){
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId,JsydghxkAttachmentNameEnum.NAME_3,nodeAttachment);
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId,JsydghxkAttachmentNameEnum.NAME_4,nodeAttachment);
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId,JsydghxkAttachmentNameEnum.NAME_5,nodeAttachment);
|
|
|
|
|
+ }
|
|
|
}else if(AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
}else if(AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,JsgcghxkAttachmentNameEnum.NAME_2,nodeAttachment);
|
|
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,JsgcghxkAttachmentNameEnum.NAME_3,nodeAttachment);
|
|
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,JsgcghxkAttachmentNameEnum.NAME_5,nodeAttachment);
|
|
|
|
|
|
|
+ String sourceId = projectMapper.getNodeSourceIdByTable(nodeId,nodeTableName);
|
|
|
|
|
+ if(StringUtils.isBlank(sourceId)) {
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId, JsgcghxkAttachmentNameEnum.NAME_2, nodeAttachment);
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId, JsgcghxkAttachmentNameEnum.NAME_3, nodeAttachment);
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId, JsgcghxkAttachmentNameEnum.NAME_5, nodeAttachment);
|
|
|
|
|
+ }
|
|
|
}else if(AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
}else if(AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,TdhyhsAttachmentNameEnum.NAME_3,nodeAttachment);
|
|
|
|
|
- nodeAttachment = this.assemblyAttachment(projectId,TdhyhsAttachmentNameEnum.NAME_5,nodeAttachment);
|
|
|
|
|
|
|
+ String sourceId = projectMapper.getNodeSourceIdByTable(nodeId,nodeTableName);
|
|
|
|
|
+ if(StringUtils.isBlank(sourceId)) {
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId, TdhyhsAttachmentNameEnum.NAME_3, nodeAttachment);
|
|
|
|
|
+ nodeAttachment = this.assemblyAttachment(projectId, TdhyhsAttachmentNameEnum.NAME_5, nodeAttachment);
|
|
|
|
|
+ }
|
|
|
}else if(AloneWorkFlowEnum.NODE_7.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
}else if(AloneWorkFlowEnum.NODE_7.getTableName().equalsIgnoreCase(nodeTableName)){
|
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydjfwscdjAttachmentNameEnum.NAME_1,nodeAttachment);
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydjfwscdjAttachmentNameEnum.NAME_1,nodeAttachment);
|
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydjfwscdjAttachmentNameEnum.NAME_2,nodeAttachment);
|
|
nodeAttachment = this.assemblyAttachment(projectId,GyjsydjfwscdjAttachmentNameEnum.NAME_2,nodeAttachment);
|