树逻辑 -- fix3

@CONTROL/树视图/CONTROL-BASE.vue.ftl

@@ -124,16 +124,14 @@ import { Util } from '@ibiz-core/utils'
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public treenodes:any = [
-        <#if ctrl.getPSDETreeNodes?? && ctrl.getPSDETreeNodes()??>
-        <#list ctrl.getPSDETreeNodes() as node>
-        <#if node.isRootNode?? && node.isRootNode()?? && node.isRootNode()>
-        <#if node.getPSDETreeNodeRSs?? && node.getPSDETreeNodeRSs()??>
-        <#list node.getPSDETreeNodeRSs() as nodeitem>
-        <#if nodeitem.getChildPSDETreeNode?? && nodeitem.getChildPSDETreeNode()??>
-        <#assign nodeitemchild = nodeitem.getChildPSDETreeNode()>
-        <#if nodeitemchild.getTreeNodeType?? && nodeitemchild.getTreeNodeType()?? && nodeitemchild.getTreeNodeType() != 'STATIC' || nodeitemchild.hasPSDETreeNodeRSs?? && nodeitemchild.hasPSDETreeNodeRSs()?? && nodeitemchild.hasPSDETreeNodeRSs()>
-        <#if nodeitemchild.getNodeType?? && nodeitemchild.getNodeType()??>'${nodeitemchild.getNodeType()}',</#if>
+        <#assign rootnode>
+        <#if ctrl.getRootPSDETreeNode?? && ctrl.getRootPSDETreeNode()?? && ctrl.getRootPSDETreeNode().getNodeType?? && ctrl.getRootPSDETreeNode().getNodeType()??>
+        <#assign rootnode = ctrl.getRootPSDETreeNode().getNodeType()>
         </#if>
+        <#if ctrl.getPSDETreeNodeRSs?? && ctrl.getPSDETreeNodeRSs()??>
+        <#list ctrl.getPSDETreeNodeRSs() as node>
+        <#if node.hasPSDETreeNodeRSs?? && node.hasPSDETreeNodeRSs()?? && node.hasPSDETreeNodeRSs() || node.getTreeNodeType?? &&  node.getTreeNodeType()?? && node.getTreeNodeType() != 'STATIC'>
+        <#if node.getNodeType?? && node.getNodeType()??>'${nodeitemchild.getNodeType()};${rootnode}',</#if>
         </#if>
         </#list>
         </#if>