ibizdev提交

app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts

@@ -63,10 +63,9 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_sys_permissionname_like: "资源名称(%)", 
-			n_type_eq: "资源类别(=)", 
-			n_systemid_eq: "系统标识(=)", 
-			n_sys_permissionid_like: "资源标识(%)", 
+			n_psdataentity_like: "实体(%)", 
+			n_psdedataset_like: "数据集(%)", 
+			n_psdedatarange_like: "数据范围(%)", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts

@@ -62,10 +62,9 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: '常规条件', 
-			n_sys_permissionname_like: '资源名称(%)', 
-			n_type_eq: '资源类别(=)', 
-			n_systemid_eq: '系统标识(=)', 
-			n_sys_permissionid_like: '资源标识(%)', 
+			n_psdataentity_like: '实体(%)', 
+			n_psdedataset_like: '数据集(%)', 
+			n_psdedatarange_like: '数据范围(%)', 
 		},
 		uiactions: {
 		},

app_web/src/widgets/sys-permission/default-drbar/default-drbar-model.ts

@@ -36,6 +36,15 @@ export default class DefaultModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'psdataentity',
+      },
+      {
+        name: 'psdedataset',
+      },
+      {
+        name: 'psdedatarange',
+      },
     ]
   }
 

app_web/src/widgets/sys-permission/default-searchform/default-searchform-model.ts

@@ -26,29 +26,19 @@ export default class DefaultModel {
         dataType: 'TEXT',
       },
       {
-        name: 'n_sys_permissionname_like',
-        prop: 'permissionname',
+        name: 'n_psdataentity_like',
+        prop: 'psdataentity',
         dataType: 'TEXT',
       },
       {
-        name: 'n_type_eq',
-        prop: 'type',
-        dataType: 'SSCODELIST',
-      },
-      {
-        name: 'n_systemid_eq',
-        prop: 'pssystemid',
+        name: 'n_psdedataset_like',
+        prop: 'psdedataset',
         dataType: 'TEXT',
       },
       {
-        name: 'n_sys_permissionid_like',
-        prop: 'permissionid',
-        dataType: 'GUID',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
+        name: 'n_psdedatarange_like',
+        prop: 'psdedatarange',
+        dataType: 'TEXT',
       },
     ]
   }

app_web/src/widgets/sys-permission/default-searchform/default-searchform-service.ts

@@ -160,7 +160,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        Object.assign(Data,{permissionid: data.permissionid, srffrontuf: '1'});
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

app_web/src/widgets/sys-permission/main-grid/main-grid-model.ts

@@ -66,29 +66,19 @@ export default class MainModel {
           prop: 'permissionid',
         },
       {
-        name: 'n_sys_permissionname_like',
-        prop: 'n_sys_permissionname_like',
+        name: 'n_psdataentity_like',
+        prop: 'n_psdataentity_like',
         dataType: 'TEXT',
       },
       {
-        name: 'n_type_eq',
-        prop: 'n_type_eq',
-        dataType: 'SSCODELIST',
-      },
-      {
-        name: 'n_systemid_eq',
-        prop: 'n_systemid_eq',
+        name: 'n_psdedataset_like',
+        prop: 'n_psdedataset_like',
         dataType: 'TEXT',
       },
       {
-        name: 'n_sys_permissionid_like',
-        prop: 'n_sys_permissionid_like',
-        dataType: 'GUID',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
+        name: 'n_psdedatarange_like',
+        prop: 'n_psdedatarange_like',
+        dataType: 'TEXT',
       },
 
         {

app_web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -36,6 +36,15 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'psdataentity',
+      },
+      {
+        name: 'psdedataset',
+      },
+      {
+        name: 'psdedatarange',
+      },
     ]
   }
 

app_web/src/widgets/sys-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -36,6 +36,15 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'psdataentity',
+      },
+      {
+        name: 'psdedataset',
+      },
+      {
+        name: 'psdedatarange',
+      },
     ]
   }
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java

@@ -86,6 +86,27 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
+    /**
+     * 实体
+     */
+    @TableField(exist = false)
+    @JSONField(name = "psdataentity")
+    @JsonProperty("psdataentity")
+    private String psdataentity;
+    /**
+     * 数据集
+     */
+    @TableField(exist = false)
+    @JSONField(name = "psdedataset")
+    @JsonProperty("psdedataset")
+    private String psdedataset;
+    /**
+     * 数据范围
+     */
+    @TableField(exist = false)
+    @JSONField(name = "psdedatarange")
+    @JsonProperty("psdedatarange")
+    private String psdedatarange;
 
 
     /**

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PERMISSIONSearchContext.java

@@ -61,6 +61,27 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
             this.getSelectCond().eq("enable", n_enable_eq);
         }
     }
+	private String n_psdataentity_like;//[实体]
+	public void setN_psdataentity_like(String n_psdataentity_like) {
+        this.n_psdataentity_like = n_psdataentity_like;
+        if(!ObjectUtils.isEmpty(this.n_psdataentity_like)){
+            this.getSelectCond().like("psdataentity", n_psdataentity_like);
+        }
+    }
+	private String n_psdedataset_like;//[数据集]
+	public void setN_psdedataset_like(String n_psdedataset_like) {
+        this.n_psdedataset_like = n_psdedataset_like;
+        if(!ObjectUtils.isEmpty(this.n_psdedataset_like)){
+            this.getSelectCond().like("psdedataset", n_psdedataset_like);
+        }
+    }
+	private String n_psdedatarange_like;//[数据范围]
+	public void setN_psdedatarange_like(String n_psdedatarange_like) {
+        this.n_psdedatarange_like = n_psdedatarange_like;
+        if(!ObjectUtils.isEmpty(this.n_psdedatarange_like)){
+            this.getSelectCond().like("psdedatarange", n_psdedatarange_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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

@@ -112,7 +112,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-35-6">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-54-6">
         <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.`TYPE`, t1.`UPDATEDATE` FROM `IBZPERMISSION` t1  
+       <![CDATA[	SELECT t1.CREATEDATE, t1.ENABLE, t1.SYSTEMID, t1.SYS_PERMISSIONID, t1.SYS_PERMISSIONNAME, t1.TYPE, t1.UPDATEDATE, 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 
 			]]>
     </sql>
 

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/dto/SYS_PERMISSIONDTO.java

@@ -81,6 +81,30 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     @JsonProperty("updatedate")
     private Timestamp updatedate;
 
+    /**
+     * 属性 [PSDATAENTITY]
+     *
+     */
+    @JSONField(name = "psdataentity")
+    @JsonProperty("psdataentity")
+    private String psdataentity;
+
+    /**
+     * 属性 [PSDEDATASET]
+     *
+     */
+    @JSONField(name = "psdedataset")
+    @JsonProperty("psdedataset")
+    private String psdedataset;
+
+    /**
+     * 属性 [PSDEDATARANGE]
+     *
+     */
+    @JSONField(name = "psdedatarange")
+    @JsonProperty("psdedatarange")
+    private String psdedatarange;
+
 
     /**
      * 设置 [SYS_PERMISSIONNAME]