ibizdev提交

app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue

@@ -1346,6 +1346,33 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONEditViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONEditViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
 
 }
 </script>

app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue

@@ -1378,6 +1378,33 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         }
     }
 
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONEditView2Base
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONEditView2Base
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
     /**
      * 选中数据
      *

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue

@@ -1093,9 +1093,11 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
             Object.assign(curViewParam,args[0]);
         }
         let deResParameters: any[] = [];
+        if(curViewParam.sys_permission && true){
             deResParameters = [
             { pathName: 'sys_permissions', parameterName: 'sys_permission' },
-        ];
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -1128,9 +1130,11 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
             Object.assign(curViewParam,args[0]);
         }
         let deResParameters: any[] = [];
+        if(curViewParam.sys_permission && true){
             deResParameters = [
             { pathName: 'sys_permissions', parameterName: 'sys_permission' },
-        ];
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -1419,6 +1423,33 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         }
     }
 
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONGridViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONGridViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
     /**
      * 是否单选
      *

app_web/src/pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view-base.vue

@@ -523,6 +523,33 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONMPickupViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONMPickupViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
     /**
      * 是否显示按钮
      *

app_web/src/pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view-base.vue

@@ -540,6 +540,33 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONPickupGridViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONPickupGridViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
     /**
      * 选中数据字符串
      *

app_web/src/pages/uaa/sys-role-permissionpickup-view/sys-role-permissionpickup-view-base.vue

@@ -489,6 +489,33 @@ export default class SYS_ROLE_PERMISSIONPickupViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONPickupViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONPickupViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
     /**
      * 选中数据的字符串
      *

app_web/src/pages/uaa/sys-role-permissionredirect-view/sys-role-permissionredirect-view-base.vue

@@ -401,6 +401,33 @@ export default class SYS_ROLE_PERMISSIONRedirectViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_ROLE_PERMISSIONRedirectViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_ROLE_PERMISSIONRedirectViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
         /**
      * 初始化视图
      *

app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue

@@ -1346,6 +1346,33 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLEEditViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLEEditViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
 
 }
 </script>

app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue

@@ -1378,6 +1378,33 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         }
     }
 
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLEEditView2Base
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLEEditView2Base
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
     /**
      * 选中数据
      *

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

@@ -1093,9 +1093,11 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             Object.assign(curViewParam,args[0]);
         }
         let deResParameters: any[] = [];
+        if(curViewParam.sys_role && true){
             deResParameters = [
             { pathName: 'sys_roles', parameterName: 'sys_role' },
-        ];
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'sys_user_roles', parameterName: 'sys_user_role' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -1128,9 +1130,11 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             Object.assign(curViewParam,args[0]);
         }
         let deResParameters: any[] = [];
+        if(curViewParam.sys_role && true){
             deResParameters = [
             { pathName: 'sys_roles', parameterName: 'sys_role' },
-        ];
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'sys_user_roles', parameterName: 'sys_user_role' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -1419,6 +1423,33 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         }
     }
 
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLEGridViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLEGridViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
     /**
      * 是否单选
      *

app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue

@@ -523,6 +523,33 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLEMPickupViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLEMPickupViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
     /**
      * 是否显示按钮
      *

app_web/src/pages/uaa/sys-user-rolepickup-grid-view/sys-user-rolepickup-grid-view-base.vue

@@ -540,6 +540,33 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLEPickupGridViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLEPickupGridViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
     /**
      * 选中数据字符串
      *

app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue

@@ -489,6 +489,33 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLEPickupViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLEPickupViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
     /**
      * 选中数据的字符串
      *

app_web/src/pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view-base.vue

@@ -401,6 +401,33 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }
     }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof SYS_USER_ROLERedirectViewBase
+     */
+    protected destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof SYS_USER_ROLERedirectViewBase
+     */
+    protected afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
         /**
      * 初始化视图
      *

app_web/src/service/sys-role-permission/sys-role-permission-service-base.ts

@@ -37,7 +37,7 @@ export default class SYS_ROLE_PERMISSIONServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * FetchDefault接口方法
+     * Select接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -45,27 +45,35 @@ export default class SYS_ROLE_PERMISSIONServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SYS_ROLE_PERMISSIONServiceBase
      */
-    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        // FetchDefault ---FETCH
-        if(context.srfsessionkey && !Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sys_role_permissions'),'undefined')){
-            let result:any = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sys_role_permissions') as any);
-            if(result){
-                return {"status":200,"data":result};
-            }else{
-                return {"status":200,"data":[]};
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sys_role && context.sys_role_permission){
+            return Http.getInstance().get(`/sys_roles/${context.sys_role}/sys_role_permissions/${context.sys_role_permission}/select`,isloading);
         }
-        }else{
-            return {"status":200,"data":[]};
+        if(context.sys_permission && context.sys_role_permission){
+            return Http.getInstance().get(`/sys_permissions/${context.sys_permission}/sys_role_permissions/${context.sys_role_permission}/select`,isloading);
         }
-        if(context.srfsessionkey && !Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sys_role_permissions'),'undefined')){
-            let result:any = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sys_role_permissions') as any);
-            if(result){
-                return {"status":200,"data":result};
-            }else{
-                return {"status":200,"data":[]};
+            return Http.getInstance().get(`/sys_role_permissions/${context.sys_role_permission}/select`,isloading);
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SYS_ROLE_PERMISSIONServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sys_role && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/sys_roles/${context.sys_role}/sys_role_permissions/select`,tempData,isloading);
         }
-        }else{
-            return {"status":200,"data":[]};
+        if(context.sys_permission && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/sys_permissions/${context.sys_permission}/sys_role_permissions/select`,tempData,isloading);
         }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/sys_role_permissions/select`,tempData,isloading);
     }
 }
\ No newline at end of file

app_web/src/service/sys-user-role/sys-user-role-service-base.ts

@@ -37,7 +37,7 @@ export default class SYS_USER_ROLEServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * FetchDefault接口方法
+     * Select接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -45,27 +45,35 @@ export default class SYS_USER_ROLEServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SYS_USER_ROLEServiceBase
      */
-    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        // FetchDefault ---FETCH
-        if(context.srfsessionkey && !Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sys_user_roles'),'undefined')){
-            let result:any = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sys_user_roles') as any);
-            if(result){
-                return {"status":200,"data":result};
-            }else{
-                return {"status":200,"data":[]};
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sys_user && context.sys_user_role){
+            return Http.getInstance().get(`/sys_users/${context.sys_user}/sys_user_roles/${context.sys_user_role}/select`,isloading);
         }
-        }else{
-            return {"status":200,"data":[]};
+        if(context.sys_role && context.sys_user_role){
+            return Http.getInstance().get(`/sys_roles/${context.sys_role}/sys_user_roles/${context.sys_user_role}/select`,isloading);
         }
-        if(context.srfsessionkey && !Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sys_user_roles'),'undefined')){
-            let result:any = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sys_user_roles') as any);
-            if(result){
-                return {"status":200,"data":result};
-            }else{
-                return {"status":200,"data":[]};
+            return Http.getInstance().get(`/sys_user_roles/${context.sys_user_role}/select`,isloading);
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SYS_USER_ROLEServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sys_user && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/sys_users/${context.sys_user}/sys_user_roles/select`,tempData,isloading);
         }
-        }else{
-            return {"status":200,"data":[]};
+        if(context.sys_role && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/sys_roles/${context.sys_role}/sys_user_roles/select`,tempData,isloading);
         }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/sys_user_roles/select`,tempData,isloading);
     }
 }
\ No newline at end of file

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

@@ -45,16 +45,6 @@ export default class DefaultModel {
       {
         name: 'systemid',
       },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

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

@@ -25,16 +25,6 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

app_web/src/widgets/sys-role-permission/main-form/main-form-model.ts

@@ -85,16 +85,6 @@ export default class MainModel {
         prop: 'rolepermissionid',
         dataType: 'GUID',
       },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
-      },
       {
         name: 'sys_role_permission',
         prop: 'rolepermissionid',

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

@@ -71,30 +71,10 @@ export default class MainModel {
           prop: 'permissionname',
           dataType: 'PICKUPTEXT',
         },
-        {
-          name: 'sys_role',
-          prop: 'roleid',
-          dataType: 'FONTKEY',
-        },
-        {
-          name: 'sys_permission',
-          prop: 'permissionid',
-          dataType: 'FONTKEY',
-        },
         {
           name: 'sys_role_permission',
           prop: 'rolepermissionid',
         },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
-      },
 
         {
           name:'size',

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

@@ -45,16 +45,6 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'systemid',
       },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

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

@@ -45,16 +45,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'systemid',
       },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_permission',
-        prop: 'permissionid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

app_web/src/widgets/sys-user-role/default-drbar/default-drbar-model.ts

@@ -39,16 +39,6 @@ export default class DefaultModel {
       {
         name: 'updatedate',
       },
-      {
-        name: 'sys_user',
-        prop: 'userid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

app_web/src/widgets/sys-user-role/default-searchform/default-searchform-model.ts

@@ -25,16 +25,6 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
-      {
-        name: 'sys_user',
-        prop: 'userid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

app_web/src/widgets/sys-user-role/main-form/main-form-model.ts

@@ -85,16 +85,6 @@ export default class MainModel {
         prop: 'userid',
         dataType: 'PICKUP',
       },
-      {
-        name: 'sys_user',
-        prop: 'userid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
       {
         name: 'sys_user_role',
         prop: 'userroleid',

app_web/src/widgets/sys-user-role/main-grid/main-grid-model.ts

@@ -66,30 +66,10 @@ export default class MainModel {
           prop: 'userid',
           dataType: 'PICKUP',
         },
-        {
-          name: 'sys_user',
-          prop: 'userid',
-          dataType: 'FONTKEY',
-        },
-        {
-          name: 'sys_role',
-          prop: 'roleid',
-          dataType: 'FONTKEY',
-        },
         {
           name: 'sys_user_role',
           prop: 'userroleid',
         },
-      {
-        name: 'sys_user',
-        prop: 'userid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
 
         {
           name:'size',

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

@@ -39,16 +39,6 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
-      {
-        name: 'sys_user',
-        prop: 'userid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

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

@@ -39,16 +39,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
-      {
-        name: 'sys_user',
-        prop: 'userid',
-        dataType: 'FONTKEY',
-      },
-      {
-        name: 'sys_role',
-        prop: 'roleid',
-        dataType: 'FONTKEY',
-      },
     ]
   }
 

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

@@ -115,12 +115,5 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     }
 
 
-    /**
-     *  [SYS_ROLE_PERMISSION]
-     */
-    @JsonProperty("sys_role_permissions")
-    @JSONField(name = "sys_role_permissions")
-	private List<SYS_ROLE_PERMISSIONDTO>  ;
-
 }
 

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

@@ -83,19 +83,5 @@ public class SYS_ROLEDTO extends DTOBase implements Serializable {
     }
 
 
-    /**
-     *  [SYS_ROLE_PERMISSION]
-     */
-    @JsonProperty("sys_role_permissions")
-    @JSONField(name = "sys_role_permissions")
-	private List<SYS_ROLE_PERMISSIONDTO>  ;
-
-    /**
-     *  [SYS_USER_ROLE]
-     */
-    @JsonProperty("sys_user_roles")
-    @JSONField(name = "sys_user_roles")
-	private List<SYS_USER_ROLEDTO>  ;
-
 }
 

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

@@ -65,12 +65,5 @@ public class SYS_USERDTO extends DTOBase implements Serializable {
     }
 
 
-    /**
-     *  [SYS_USER_ROLE]
-     */
-    @JsonProperty("sys_user_roles")
-    @JSONField(name = "sys_user_roles")
-	private List<SYS_USER_ROLEDTO>  ;
-
 }
 

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/rest/SYS_PERMISSIONResource.java

@@ -38,9 +38,6 @@ import cn.ibizlab.core.uaa.filter.SYS_PERMISSIONSearchContext;
 
 
 
-import cn.ibizlab.core.uaa.filter.SYS_ROLE_PERMISSIONSearchContext;
-import cn.ibizlab.core.uaa.domain.SYS_ROLE_PERMISSION;
-import cn.ibizlab.core.uaa.service.ISYS_ROLE_PERMISSIONService;
 
 @Slf4j
 @Api(tags = {"SYS_PERMISSION" })
@@ -55,10 +52,6 @@ public class SYS_PERMISSIONResource {
     @Lazy
     private SYS_PERMISSIONMapping sys_permissionMapping;
 
-    @Autowired
-    private ISYS_ROLE_PERMISSIONService sys_role_permissionService;
-
-
 
     /**
      * 用户权限校验

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/rest/SYS_ROLEResource.java

@@ -38,12 +38,6 @@ import cn.ibizlab.core.uaa.filter.SYS_ROLESearchContext;
 
 
 
-import cn.ibizlab.core.uaa.filter.SYS_ROLE_PERMISSIONSearchContext;
-import cn.ibizlab.core.uaa.domain.SYS_ROLE_PERMISSION;
-import cn.ibizlab.core.uaa.service.ISYS_ROLE_PERMISSIONService;
-import cn.ibizlab.core.uaa.filter.SYS_USER_ROLESearchContext;
-import cn.ibizlab.core.uaa.domain.SYS_USER_ROLE;
-import cn.ibizlab.core.uaa.service.ISYS_USER_ROLEService;
 
 @Slf4j
 @Api(tags = {"SYS_ROLE" })
@@ -58,14 +52,6 @@ public class SYS_ROLEResource {
     @Lazy
     private SYS_ROLEMapping sys_roleMapping;
 
-    @Autowired
-    private ISYS_ROLE_PERMISSIONService sys_role_permissionService;
-
-
-    @Autowired
-    private ISYS_USER_ROLEService sys_user_roleService;
-
-
 
     /**
      * 用户权限校验

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/rest/SYS_ROLE_PERMISSIONResource.java

+package cn.ibizlab.uaaapi.rest;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
+
+import javax.servlet.ServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+import cn.ibizlab.uaaapi.dto.*;
+import cn.ibizlab.uaaapi.mapping.*;
+import cn.ibizlab.core.uaa.domain.SYS_ROLE_PERMISSION;
+import cn.ibizlab.core.uaa.service.ISYS_ROLE_PERMISSIONService;
+import cn.ibizlab.core.uaa.filter.SYS_ROLE_PERMISSIONSearchContext;
+
+
+
+
+@Slf4j
+@Api(tags = {"SYS_ROLE_PERMISSION" })
+@RestController("uaaapi-sys_role_permission")
+@RequestMapping("")
+public class SYS_ROLE_PERMISSIONResource {
+
+    @Autowired
+    private ISYS_ROLE_PERMISSIONService sys_role_permissionService;
+
+    @Autowired
+    @Lazy
+    private SYS_ROLE_PERMISSIONMapping sys_role_permissionMapping;
+
+
+
+
+
+
+    /**
+     * 用户权限校验
+     * @return
+     */
+	public SYS_ROLE_PERMISSION getEntity(){
+        return new SYS_ROLE_PERMISSION();
+    }
+
+}

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/rest/SYS_USERResource.java

@@ -38,9 +38,6 @@ import cn.ibizlab.core.uaa.filter.SYS_USERSearchContext;
 
 
 
-import cn.ibizlab.core.uaa.filter.SYS_USER_ROLESearchContext;
-import cn.ibizlab.core.uaa.domain.SYS_USER_ROLE;
-import cn.ibizlab.core.uaa.service.ISYS_USER_ROLEService;
 
 @Slf4j
 @Api(tags = {"SYS_USER" })
@@ -55,10 +52,6 @@ public class SYS_USERResource {
     @Lazy
     private SYS_USERMapping sys_userMapping;
 
-    @Autowired
-    private ISYS_USER_ROLEService sys_user_roleService;
-
-
 
     /**
      * 用户权限校验

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/rest/SYS_USER_ROLEResource.java

+package cn.ibizlab.uaaapi.rest;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
+
+import javax.servlet.ServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+import cn.ibizlab.uaaapi.dto.*;
+import cn.ibizlab.uaaapi.mapping.*;
+import cn.ibizlab.core.uaa.domain.SYS_USER_ROLE;
+import cn.ibizlab.core.uaa.service.ISYS_USER_ROLEService;
+import cn.ibizlab.core.uaa.filter.SYS_USER_ROLESearchContext;
+
+
+
+
+@Slf4j
+@Api(tags = {"SYS_USER_ROLE" })
+@RestController("uaaapi-sys_user_role")
+@RequestMapping("")
+public class SYS_USER_ROLEResource {
+
+    @Autowired
+    private ISYS_USER_ROLEService sys_user_roleService;
+
+    @Autowired
+    @Lazy
+    private SYS_USER_ROLEMapping sys_user_roleMapping;
+
+
+
+
+
+
+    /**
+     * 用户权限校验
+     * @return
+     */
+	public SYS_USER_ROLE getEntity(){
+        return new SYS_USER_ROLE();
+    }
+
+}