菜单

SLN/%PUBPRJ%-core/src/main/resources/deprivs/DEPrivs.json.ftl

@@ -120,18 +120,15 @@ TARGET=PSSYSTEM
     <#assign result_MenuItems="[" >
     <#if menuGroup.getPSAppMenuItems()??>
         <#list menuGroup.getPSAppMenuItems() as appMenuItem>
-            <#if appMenuItem_index gt 0>
-            <#assign result_MenuItems=result_MenuItems+",">
-            </#if>
             <#assign singMenuItem="">
             <#if appMenuItem.getPSAppMenuItems()??>
-                <#--<#assign child_appMenuItem=getAppMenuItems(appMenuItem)>-->
-                <#assign singMenuItem="{\"id\":\""+appMenuItem.id+"\" , \"name\":\""+appMenuItem.name+"\" , \"caption\":\""+appMenuItem.getCaption()+"\" , \"items\":"+getAppMenuItems(appMenuItem)+"}">
+                <#assign result_MenuItems=result_MenuItems+"{\"id\":\""+appMenuItem.id+"\" , \"name\":\""+appMenuItem.name+"\" , \"caption\":\""+appMenuItem.getCaption()+"\" , \"items\":"+getAppMenuItems(appMenuItem)+"}">
             <#else>
-                <#assign singMenuItem="{\"id\":\""+appMenuItem.id+"\" , \"name\":\""+appMenuItem.name+"\" , \"caption\":\""+appMenuItem.getCaption()+"\" }">
+                <#assign result_MenuItems=result_MenuItems+"{\"id\":\""+appMenuItem.id+"\" , \"name\":\""+appMenuItem.name+"\" , \"caption\":\""+appMenuItem.getCaption()+"\" }">
+            </#if>
+            <#if appMenuItem_has_next>
+                <#assign result_MenuItems=result_MenuItems+",">
             </#if>
-            <#--<#assign singMenuItem=getAppMenuItem(appMenuItem)>-->
-            <#assign result_MenuItems=result_MenuItems+singMenuItem>
         </#list>
     </#if>
     <#assign result_MenuItems=result_MenuItems+"]" >