ibizdev提交

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

@@ -9,6 +9,7 @@ export default {
     createdate: '建立时间',
     updatedate: '更新时间',
     pssourcetype: '来源',
+    pssourcename: '来源名称',
   },
 	views: {
 		gridview: {
@@ -63,6 +64,7 @@ export default {
 			sys_permissionid: "资源标识",
 			sys_permissionname: "资源名称",
 			pssourcetype: "来源",
+			pssourcename: "来源名称",
 		},
 		uiactions: {
 		},

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

@@ -8,6 +8,7 @@ export default {
     createdate: '建立时间',
     updatedate: '更新时间',
     pssourcetype: '来源',
+    pssourcename: '来源名称',
   },
 	views: {
 		gridview: {
@@ -62,6 +63,7 @@ export default {
 			sys_permissionid: '资源标识',
 			sys_permissionname: '资源名称',
 			pssourcetype: '来源',
+			pssourcename: '来源名称',
 		},
 		uiactions: {
 		},

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

@@ -39,6 +39,9 @@ export default class DefaultModel {
       {
         name: 'pssourcetype',
       },
+      {
+        name: 'pssourcename',
+      },
     ]
   }
 

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -39,6 +39,13 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('pssourcename')">
+                <el-table-column show-overflow-tooltip :prop="'pssourcename'" :label="$t('entities.sys_permission.main_grid.columns.pssourcename')" :width="150" :align="'left'" :sortable="'custom'">
+                    <template v-slot="{row,column}">
+                        <span>{{row.pssourcename}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -517,6 +524,13 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             util: 'px'
         },
+        {
+            name: 'pssourcename',
+            label: '来源名称',
+            langtag: 'entities.sys_permission.main_grid.columns.pssourcename',
+            show: true,
+            util: 'px'
+        },
     ]
 
     /**

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

@@ -31,6 +31,11 @@ export default class MainModel {
           prop: 'pssourcetype',
           dataType: 'TEXT',
         },
+        {
+          name: 'pssourcename',
+          prop: 'pssourcename',
+          dataType: 'TEXT',
+        },
         {
           name: 'sys_permissionid',
           prop: 'permissionid',

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

@@ -39,6 +39,9 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'pssourcetype',
       },
+      {
+        name: 'pssourcename',
+      },
     ]
   }
 

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

@@ -39,6 +39,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'pssourcetype',
       },
+      {
+        name: 'pssourcename',
+      },
     ]
   }
 

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

@@ -93,6 +93,13 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     @JSONField(name = "pssourcetype")
     @JsonProperty("pssourcetype")
     private String pssourcetype;
+    /**
+     * 来源名称
+     */
+    @TableField(exist = false)
+    @JSONField(name = "pssourcename")
+    @JsonProperty("pssourcename")
+    private String pssourcename;
 
 
     /**

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

@@ -68,6 +68,13 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
             this.getSelectCond().eq("pssourcetype", n_pssourcetype_eq);
         }
     }
+	private String n_pssourcename_like;//[来源名称]
+	public void setN_pssourcename_like(String n_pssourcename_like) {
+        this.n_pssourcename_like = n_pssourcename_like;
+        if(!ObjectUtils.isEmpty(this.n_pssourcename_like)){
+            this.getSelectCond().like("pssourcename", n_pssourcename_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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-146-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-160-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 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, t2.PSSOURCENAME 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-api/src/main/java/cn/ibizlab/api/dto/SYS_PERMISSIONDTO.java

@@ -89,6 +89,14 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     @JsonProperty("pssourcetype")
     private String pssourcetype;
 
+    /**
+     * 属性 [PSSOURCENAME]
+     *
+     */
+    @JSONField(name = "pssourcename")
+    @JsonProperty("pssourcename")
+    private String pssourcename;
+
 
     /**
      * 设置 [SYS_PERMISSIONNAME]