Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7sfstdtempl/ibiz4jr7 into dev

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

 <#ibiztemplate>
 TARGET=PSSYSTEM
 </#ibiztemplate>
-    <#if sys.getAllPSApps()??>
     {
+    "unires":[
+       <#if sys.getAllPSSysUniReses()??>
+       <#list sys.getAllPSSysUniReses() as unires>
+        <#if unires_index gt 0>,</#if>
+       {
+            "uniresid":"${unires.getResCode()}",
+            "uniresname":"${unires.getName()}"
+       }
+       </#list>
+       </#if>
+    ],
+    <#if sys.getAllPSApps()??>
     "predefineddatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
     <#assign ct=0>
     "entities":[
         <#list sys.getAllPSApps() as app>
             <#if app.getAllPSAppDataEntities?? && app.getAllPSAppDataEntities()??>
-                <#list app.getAllPSAppDataEntities() as appde><#comment>由于平台暂未开放获取实体操作标识的方法，所以暂时写死</#comment>
+                <#list app.getAllPSAppDataEntities() as appde>
                     <#assign de=appde.getPSDE()>
                     <#if !P.exists(de.getCodeName(),"")>
                         <#if (ct>0)>
@@ -28,9 +39,8 @@ TARGET=PSSYSTEM
         </#list>
     ]
 
-    }
     </#if>
-
+    }
 <#comment>获取实体数据集</#comment>
 <#function getDataSet>
     <#assign result="[" >
@@ -61,3 +71,18 @@ TARGET=PSSYSTEM
     <#return result>
 </#function>
 
+
+<#comment>获取统一资源</#comment>
+<#function getUniRes>
+    <#assign result="[" >
+    <#if de.getAllPSDEActions()??>
+        <#list de.getAllPSDEActions() as deAction>
+            <#if deAction_index gt 0><#assign result=result+","></#if>
+            <#assign deActionLogicName="">
+            <#if deAction.getLogicName()?? && deAction.getLogicName()!=''><#assign deActionLogicName=deAction.getLogicName()><#else><#assign deActionLogicName=deAction.codeName></#if>
+            <#assign result=result+"{\"id\":\""+deAction.codeName+"\" , \"name\":\""+deActionLogicName+"\" , \"type\":\""+deAction.getActionType()+"\" }">
+        </#list>
+    </#if>
+    <#assign result=result+"]" >
+    <#return result>
+</#function>