ibizdev提交

app_web/src/service/entity-service.ts

@@ -33,47 +33,47 @@ export default class EntityService {
     /**
      * 零时储存,localStorage指向
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected tempStorage:any;
+    public tempStorage:any;
 
     /**
      * 当前DE标识
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPDEKEY:string= '';
+    public APPDEKEY:string= '';
 
     /**
      * 当前APPDE标识
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPLYDEKEY:string= '';
+    public APPLYDEKEY:string= '';
 
     /**
      * 当前NAME
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPDENAME:string= '';
+    public APPDENAME:string= '';
 
     /**
      * 当前主信息名
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof EntityService
      */ 
-    protected APPDETEXT:string= '';
+    public APPDETEXT:string= '';
 
     /**
      * Creates an instance of EntityService.

ibzuaa-core/src/main/resources/deprivs/DEPrivs.json

@@ -2,61 +2,54 @@
     {
     "predefineddatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
     "entities":[
-
     {
     "dename":"SYS_ROLE_PERMISSION",
     "delogicname":"角色权限关系",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" }]
      }
-    ,
-    {
+    ,    {
     "dename":"SYS_PERMISSION",
     "delogicname":"权限/资源",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" }]
      }
-    ,
-    {
+    ,    {
     "dename":"SYS_USER_ROLE",
     "delogicname":"用户角色关系",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }]
      }
-    ,
-    {
+    ,    {
     "dename":"SYS_USER",
     "delogicname":"系统用户",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" }]
      }
-    ,
-    {
+    ,    {
     "dename":"SYS_ROLE",
     "delogicname":"系统角色",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" }]
      }
-    ,
-    {
+    ,    {
     "dename":"SYS_PSAPPMENUITEM",
     "delogicname":"系统菜单项",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" }]
      }
-    ,
-    {
+    ,    {
     "dename":"SYS_PSDEOPPRIV",
     "delogicname":"实体数据操作标识",
     "sysmoudle":{"id":"UAA","name":"uaa"},
-    "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "deaction":[{"id":"CREATE","name":"新建","type":"BUILTIN"},{"id":"UPDATE","name":"编辑","type":"BUILTIN"},{"id":"READ","name":"读取","type":"BUILTIN"},{"id":"DELETE","name":"删除","type":"BUILTIN"},{"id":"CUSTOM","name":"自定义行为","type":"USERCUSTOM"}]
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }]
      }
     ]
 

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -120,7 +120,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-142-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-146-7">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>

ibzuaa-core/src/main/resources/mapper/uaa/sys_permission/SYS_PERMISSIONMapper.xml

@@ -26,7 +26,7 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.CREATEDATE, t1.ENABLE, t1.SYSTEMID, t1.SYS_PERMISSIONID, t1.SYS_PERMISSIONNAME, t1.PERMISSIONTYPE, t1.UPDATEDATE, t2.PSSOURCETYPE, t2.PSDATAENTITYNAME as PSDATAENTITY, t2.PSDEDATASETNAME as PSDEDATASET, t2.PSDEDATARANGENAME as PSDEDATARANGE FROM IBZPERMISSION t1  LEFT JOIN ibzpsdeoppriv t2 on t1.SYS_PERMISSIONID=t2.SYS_PSDEOPPRIVID LEFT JOIN ibzpsappmenuitem t3 on t1.SYS_PERMISSIONID =t3.PSAPPMENUID 
+       <![CDATA[	SELECT t1.CREATEDATE, t1.ENABLE, t1.SYSTEMID, t1.SYS_PERMISSIONID, t1.SYS_PERMISSIONNAME, t1.PERMISSIONTYPE, t1.UPDATEDATE, t2.PSSOURCETYPE FROM IBZPERMISSION t1  LEFT JOIN ibzpsdeoppriv t2 on t1.SYS_PERMISSIONID=t2.SYS_PSDEOPPRIVID LEFT JOIN ibzpsappmenuitem t3 on t1.SYS_PERMISSIONID =t3.PSAPPMENUID 
 			]]>
     </sql>