fixed shareholder structure -- frank

atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.ctrl.js

@@ -150,19 +150,21 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$
             for (var i = 0; i < linkGs.length; i++) {
                 var linkG = linkGs[i];
                 var link_id = linkG.attributes[0].value;
-                var linkGSelector = "svg>g[link-id='" + link_id + "']";
-                linkG = $(linkGSelector);
-                var inResut = _.find(gArray, function (item) {
-                    return item.attr("link-id") === link_id || item.attr("second-link-id") === link_id;
-                });
-                if (inResut) {
-                    continue;
-                }
-                gArray.push(linkG);
-                var numbers = link_id.match(/\d+/g).map(Number);
-                for (var j = 0; j < numbers.length; j++) {
-                    if (numbers[j].toString() !== nodeId) {
-                        getGArray(numbers[j], gArray);
+                if (link_id.substring(0, 3) === "[" + nodeId + "]") {
+                    var linkGSelector = "svg>g[link-id='" + link_id + "']";
+                    linkG = $(linkGSelector);
+                    var inResut = _.find(gArray, function (item) {
+                        return item.attr("link-id") === link_id;
+                    });
+                    if (inResut) {
+                        continue;
+                    }
+                    gArray.push(linkG);
+                    var numbers = link_id.match(/\d+/g).map(Number);
+                    for (var j = 0; j < numbers.length; j++) {
+                        if (numbers[j].toString() !== nodeId) {
+                            getGArray(numbers[j], gArray);
+                        }
                     }
                 }
             }
@@ -172,19 +174,21 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$
             for (var i = 0; i < secondLinkGs.length; i++) {
                 var secondLinkG = secondLinkGs[i];
                 var secondLink_id = secondLinkG.attributes[0].value;
-                var secondLinkGSelector = "svg>g[second-link-id='" + secondLink_id + "']";
-                secondLinkG = $(secondLinkGSelector);
-                var inResut = _.find(gArray, function (item) {
-                    return item.attr("link-id") === secondLink_id || item.attr("second-link-id") === secondLink_id;
-                });
-                if (inResut) {
-                    continue;
-                }
-                gArray.push(secondLinkG);
-                var numbers = secondLink_id.match(/\d+/g).map(Number);
-                for (var j = 0; j < numbers.length; j++) {
-                    if (numbers[j].toString() !== nodeId) {
-                        getGArray(numbers[j], gArray);
+                if (secondLink_id.substring(3) === "[" + nodeId + "]") {
+                    var secondLinkGSelector = "svg>g[second-link-id='" + secondLink_id + "']";
+                    secondLinkG = $(secondLinkGSelector);
+                    var inResut = _.find(gArray, function (item) {
+                        return item.attr("second-link-id") === secondLink_id;
+                    });
+                    if (inResut) {
+                        continue;
+                    }
+                    gArray.push(secondLinkG);
+                    var numbers = secondLink_id.match(/\d+/g).map(Number);
+                    for (var j = 0; j < numbers.length; j++) {
+                        if (numbers[j].toString() !== nodeId) {
+                            getGArray(numbers[j], gArray);
+                        }
                     }
                 }
             }
@@ -193,11 +197,13 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$
 
     var exportStart = function (sender, options, svg) {
         var nodeId = options.options.nodeId;
-        var gArray = [];
-        getGArray(nodeId, gArray);
-        $("svg>g").remove();
-        for (var i = 0; i < gArray.length; i++) {
-            $("svg").append(gArray[i]);
+        if(nodeId) {
+            var gArray = [];
+            getGArray(nodeId, gArray);
+            $("svg>g").remove();
+            for (var i = 0; i < gArray.length; i++) {
+                $("svg").append(gArray[i]);
+            }
         }
         var svg = $('svg')[0].outerHTML;
         console.log("svg", svg);