Merge branch 'master' of http://labcs.ibizee.cn/ibiz4jteam/ibzuaa

app_web/src/pages/uaa/sys-authloggrid-view/sys-authloggrid-view-base.vue

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入用户全局名" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="用户全局名" />
                 <div class='pull-right'>
                 </div>
             </div>

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

@@ -496,25 +496,25 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -578,6 +578,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -604,6 +607,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -630,6 +636,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -656,6 +665,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -682,6 +694,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -708,6 +723,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -734,6 +752,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }

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

@@ -504,25 +504,25 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -610,6 +610,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -636,6 +639,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -662,6 +668,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -688,6 +697,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -714,6 +726,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -740,6 +755,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -766,6 +784,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }

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

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入资源名称" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="资源名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -555,34 +555,34 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click($event, '', $event2);
+            this.toolbar_tbitem4_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click($event, '', $event2);
+            this.toolbar_tbitem6_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click($event, '', $event2);
+            this.toolbar_tbitem24_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click($event, '', $event2);
+            this.toolbar_tbitem25_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click($event, '', $event2);
+            this.toolbar_tbitem8_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click($event, '', $event2);
+            this.toolbar_tbitem13_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click($event, '', $event2);
+            this.toolbar_tbitem11_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
     }
 
@@ -706,6 +706,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -732,6 +735,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -758,6 +764,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -784,6 +793,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -810,6 +822,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -836,6 +851,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -862,6 +880,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -888,6 +909,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -914,6 +938,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }
@@ -940,6 +967,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"SYS_PERMISSION");
     }

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

@@ -496,25 +496,25 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -578,6 +578,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -604,6 +607,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -630,6 +636,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -656,6 +665,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -682,6 +694,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -708,6 +723,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -734,6 +752,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }

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

@@ -504,25 +504,25 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -610,6 +610,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -636,6 +639,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -662,6 +668,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -688,6 +697,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -714,6 +726,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -740,6 +755,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -766,6 +784,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }

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

@@ -6,7 +6,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入角色权限关系表名称" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="角色权限关系表名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -552,34 +552,34 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click($event, '', $event2);
+            this.toolbar_tbitem4_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click($event, '', $event2);
+            this.toolbar_tbitem6_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click($event, '', $event2);
+            this.toolbar_tbitem24_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click($event, '', $event2);
+            this.toolbar_tbitem25_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click($event, '', $event2);
+            this.toolbar_tbitem8_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click($event, '', $event2);
+            this.toolbar_tbitem13_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click($event, '', $event2);
+            this.toolbar_tbitem11_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
     }
 
@@ -703,6 +703,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -729,6 +732,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -755,6 +761,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -781,6 +790,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -807,6 +819,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -833,6 +848,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -859,6 +877,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -885,6 +906,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -911,6 +935,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }
@@ -937,6 +964,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE_PERMISSION");
     }

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

@@ -496,25 +496,25 @@ export default class SYS_ROLEEditViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -578,6 +578,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -604,6 +607,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -630,6 +636,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -656,6 +665,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -682,6 +694,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -708,6 +723,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -734,6 +752,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }

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

@@ -504,25 +504,25 @@ export default class SYS_ROLEEditView2Base extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -610,6 +610,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -636,6 +639,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -662,6 +668,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -688,6 +697,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -714,6 +726,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -740,6 +755,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -766,6 +784,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }

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

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入角色表名称" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="角色表名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -555,34 +555,34 @@ export default class SYS_ROLEGridViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click($event, '', $event2);
+            this.toolbar_tbitem4_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click($event, '', $event2);
+            this.toolbar_tbitem6_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click($event, '', $event2);
+            this.toolbar_tbitem24_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click($event, '', $event2);
+            this.toolbar_tbitem25_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click($event, '', $event2);
+            this.toolbar_tbitem8_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click($event, '', $event2);
+            this.toolbar_tbitem13_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click($event, '', $event2);
+            this.toolbar_tbitem11_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
     }
 
@@ -706,6 +706,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -732,6 +735,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -758,6 +764,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -784,6 +793,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -810,6 +822,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -836,6 +851,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -862,6 +880,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -888,6 +909,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -914,6 +938,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }
@@ -940,6 +967,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"SYS_ROLE");
     }

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

@@ -496,25 +496,25 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -578,6 +578,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -604,6 +607,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -630,6 +636,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -656,6 +665,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -682,6 +694,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -708,6 +723,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -734,6 +752,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }

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

@@ -504,25 +504,25 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -610,6 +610,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -636,6 +639,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -662,6 +668,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -688,6 +697,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -714,6 +726,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -740,6 +755,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -766,6 +784,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }

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

@@ -6,7 +6,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入用户角色关系表名称" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="用户角色关系表名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -552,34 +552,34 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click($event, '', $event2);
+            this.toolbar_tbitem4_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click($event, '', $event2);
+            this.toolbar_tbitem6_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click($event, '', $event2);
+            this.toolbar_tbitem24_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click($event, '', $event2);
+            this.toolbar_tbitem25_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click($event, '', $event2);
+            this.toolbar_tbitem8_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click($event, '', $event2);
+            this.toolbar_tbitem13_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click($event, '', $event2);
+            this.toolbar_tbitem11_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
     }
 
@@ -703,6 +703,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -729,6 +732,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -755,6 +761,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -781,6 +790,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -807,6 +819,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -833,6 +848,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -859,6 +877,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -885,6 +906,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -911,6 +935,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }
@@ -937,6 +964,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER_ROLE");
     }

app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue

@@ -496,25 +496,25 @@ export default class SYS_USEREditViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -578,6 +578,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -604,6 +607,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -630,6 +636,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -656,6 +665,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -682,6 +694,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -708,6 +723,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -734,6 +752,9 @@ export default class SYS_USEREditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }

app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue

@@ -504,25 +504,25 @@ export default class SYS_USEREditView2Base extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click($event, '', $event2);
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem10')) {
-            this.toolbar_tbitem10_click($event, '', $event2);
+            this.toolbar_tbitem10_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click($event, '', $event2);
+            this.toolbar_tbitem12_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem14')) {
-            this.toolbar_tbitem14_click($event, '', $event2);
+            this.toolbar_tbitem14_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
-            this.toolbar_tbitem15_click($event, '', $event2);
+            this.toolbar_tbitem15_click(null, '', $event2);
         }
     }
 
@@ -610,6 +610,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -636,6 +639,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -662,6 +668,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -688,6 +697,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -714,6 +726,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -740,6 +755,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -766,6 +784,9 @@ export default class SYS_USEREditView2Base extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入用户姓名" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="用户姓名" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -555,34 +555,34 @@ export default class SYS_USERGridViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+            this.toolbar_tbitem3_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click($event, '', $event2);
+            this.toolbar_tbitem4_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click($event, '', $event2);
+            this.toolbar_tbitem5_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click($event, '', $event2);
+            this.toolbar_tbitem6_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click($event, '', $event2);
+            this.toolbar_tbitem24_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click($event, '', $event2);
+            this.toolbar_tbitem25_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click($event, '', $event2);
+            this.toolbar_tbitem8_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click($event, '', $event2);
+            this.toolbar_tbitem13_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click($event, '', $event2);
+            this.toolbar_tbitem11_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
     }
 
@@ -706,6 +706,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -732,6 +735,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -758,6 +764,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -784,6 +793,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -810,6 +822,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -836,6 +851,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -862,6 +880,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -888,6 +909,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -914,6 +938,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }
@@ -940,6 +967,9 @@ export default class SYS_USERGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"SYS_USER");
     }

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

@@ -1279,7 +1279,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
 	public uiAction(row: any, tag: any, $event: any) {
-        this.rowClick(row, true);
+        // this.rowClick(row, true);
     }
 
     /**

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

@@ -1209,7 +1209,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
 	public uiAction(row: any, tag: any, $event: any) {
-        this.rowClick(row, true);
+        // this.rowClick(row, true);
     }
 
     /**

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

@@ -1199,7 +1199,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
 	public uiAction(row: any, tag: any, $event: any) {
-        this.rowClick(row, true);
+        // this.rowClick(row, true);
     }
 
     /**

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

@@ -1213,7 +1213,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
 	public uiAction(row: any, tag: any, $event: any) {
-        this.rowClick(row, true);
+        // this.rowClick(row, true);
     }
 
     /**

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -1213,7 +1213,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
 	public uiAction(row: any, tag: any, $event: any) {
-        this.rowClick(row, true);
+        // this.rowClick(row, true);
     }
 
     /**

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

@@ -1199,7 +1199,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
 	public uiAction(row: any, tag: any, $event: any) {
-        this.rowClick(row, true);
+        // this.rowClick(row, true);
     }
 
     /**

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Papi
-      cd ibzuaa-provider/ibzuaa-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzuaa-app/ibzuaa-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30002
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,9 +3,23 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "8080:8080"
+      - "30002:30002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30002
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - ABC=1
+      - DEC=2
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-core/pom.xml

@@ -150,7 +150,7 @@
                                     <verbose>true</verbose>
                                     <logging>debug</logging>
                                     <contexts>!test</contexts>
-                                    <diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit</diffExcludeObjects>
+                                    <diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit,IBZFILE,IBZUSER,IBZDATAAUDIT</diffExcludeObjects>
                                 </configuration>
                                 <phase>process-resources</phase>
                                 <goals>

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

@@ -87,22 +87,8 @@
                 </column>
         </createTable>
     </changeSet>
-    <!--输出实体[SYS_USER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user-42-4">
-        <createTable tableName="IBZUSER">
-                <column name="USERID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_USERID"/>
-                </column>
-                <column name="USERNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="PERSONNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PASSWORD" remarks="" type="VARCHAR(100)">
-                </column>
-        </createTable>
-    </changeSet>
     <!--输出实体[SYS_PSSYSUNIRES]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-91-5">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-91-4">
         <createTable tableName="IBZPSSYSUNIRES">
                 <column name="SYS_PSSYSUNIRESID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSUNIRES_SYS_PSSYSUN"/>
@@ -118,7 +104,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-47-6">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-47-5">
         <createTable tableName="IBZUSER_ROLE">
                 <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
@@ -140,7 +126,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-191-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-191-6">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
@@ -160,7 +146,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-81-8">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-81-7">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -176,7 +162,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PSSYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-9-9">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-9-8">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
@@ -186,7 +172,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PSAPPMENUITEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-98-10">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-98-9">
         <createTable tableName="IBZPSAPPMENUITEM">
                 <column name="SYS_PSAPPMENUITEMID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PSAPPMENUITEM_SYS_PSAPP"/>
@@ -217,17 +203,13 @@
         <!--输出实体[SYS_AUTHLOG]外键关系 -->
         <!--输出实体[SYS_PSDEOPPRIV]外键关系 -->
         <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-68-11">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-68-10">
        <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
     </changeSet>
-        <!--输出实体[SYS_USER]外键关系 -->
         <!--输出实体[SYS_PSSYSUNIRES]外键关系 -->
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-47-13">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-47-12">
        <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
-    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-47-14">
-       <addForeignKeyConstraint baseColumnNames="SYS_USERID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_USER_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZUSER" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_PERMISSION]外键关系 -->
         <!--输出实体[SYS_ROLE]外键关系 -->

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,21 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_AUTHLOGResource.java

@@ -54,20 +54,14 @@ public class SYS_AUTHLOGResource {
 
     public SYS_AUTHLOGDTO permissionDTO=new SYS_AUTHLOGDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_AUTHLOG" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_authlogs/getdraft")
     public ResponseEntity<SYS_AUTHLOGDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_authlogMapping.toDto(sys_authlogService.getDraft(new SYS_AUTHLOG())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_AUTHLOG" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_authlogs/{sys_authlog_id}")
     @Transactional
@@ -79,6 +73,7 @@ public class SYS_AUTHLOGResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_AUTHLOG" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_authlogs/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_AUTHLOGDTO> sys_authlogdtos) {
@@ -86,10 +81,7 @@ public class SYS_AUTHLOGResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_AUTHLOG" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_authlogs/{sys_authlog_id}")
     @Transactional
@@ -97,6 +89,7 @@ public class SYS_AUTHLOGResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_authlogService.remove(sys_authlog_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_AUTHLOG" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_authlogs/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -104,10 +97,7 @@ public class SYS_AUTHLOGResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_AUTHLOG" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs")
     @Transactional
@@ -118,6 +108,7 @@ public class SYS_AUTHLOGResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_AUTHLOG" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_AUTHLOGDTO> sys_authlogdtos) {
@@ -125,20 +116,14 @@ public class SYS_AUTHLOGResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_AUTHLOG" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_AUTHLOGDTO sys_authlogdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_authlogService.checkKey(sys_authlogMapping.toDomain(sys_authlogdto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_AUTHLOG" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_authlogs/{sys_authlog_id}")
     public ResponseEntity<SYS_AUTHLOGDTO> get(@PathVariable("sys_authlog_id") String sys_authlog_id) {
@@ -147,16 +132,14 @@ public class SYS_AUTHLOGResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_AUTHLOG" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_AUTHLOGDTO sys_authlogdto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_authlogService.save(sys_authlogMapping.toDomain(sys_authlogdto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_AUTHLOG" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_AUTHLOGDTO> sys_authlogdtos) {
@@ -164,7 +147,7 @@ public class SYS_AUTHLOGResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_AUTHLOG" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_authlogs/fetchdefault")
 	public ResponseEntity<List<SYS_AUTHLOGDTO>> fetchDefault(SYS_AUTHLOGSearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_AUTHLOGResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_AUTHLOG" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_authlogs/searchdefault")
 	public ResponseEntity<Page<SYS_AUTHLOGDTO>> searchDefault(@RequestBody SYS_AUTHLOGSearchContext context) {
@@ -185,8 +168,4 @@ public class SYS_AUTHLOGResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_authlogMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

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

@@ -54,16 +54,14 @@ public class SYS_PERMISSIONResource {
 
     public SYS_PERMISSIONDTO permissionDTO=new SYS_PERMISSIONDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_PERMISSION" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_PERMISSIONDTO sys_permissiondto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_permissionService.save(sys_permissionMapping.toDomain(sys_permissiondto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_PERMISSION" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
@@ -71,20 +69,14 @@ public class SYS_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_PERMISSION" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/getdraft")
     public ResponseEntity<SYS_PERMISSIONDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_permissionMapping.toDto(sys_permissionService.getDraft(new SYS_PERMISSION())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_PERMISSION" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/{sys_permission_id}")
     @Transactional
@@ -92,6 +84,7 @@ public class SYS_PERMISSIONResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_permissionService.remove(sys_permission_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_PERMISSION" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -99,10 +92,7 @@ public class SYS_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_PERMISSION" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/{sys_permission_id}")
     @Transactional
@@ -114,6 +104,7 @@ public class SYS_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_PERMISSION" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
@@ -121,10 +112,7 @@ public class SYS_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_PERMISSION" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions")
     @Transactional
@@ -135,6 +123,7 @@ public class SYS_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_PERMISSION" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
@@ -142,20 +131,14 @@ public class SYS_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_PERMISSION" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_PERMISSIONDTO sys_permissiondto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_permissionService.checkKey(sys_permissionMapping.toDomain(sys_permissiondto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_PERMISSION" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}")
     public ResponseEntity<SYS_PERMISSIONDTO> get(@PathVariable("sys_permission_id") String sys_permission_id) {
@@ -164,7 +147,7 @@ public class SYS_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_permissions/fetchdefault")
 	public ResponseEntity<List<SYS_PERMISSIONDTO>> fetchDefault(SYS_PERMISSIONSearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_permissions/searchdefault")
 	public ResponseEntity<Page<SYS_PERMISSIONDTO>> searchDefault(@RequestBody SYS_PERMISSIONSearchContext context) {
@@ -185,8 +168,4 @@ public class SYS_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSAPPMENUITEMResource.java

@@ -54,16 +54,14 @@ public class SYS_PSAPPMENUITEMResource {
 
     public SYS_PSAPPMENUITEMDTO permissionDTO=new SYS_PSAPPMENUITEMDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_PSAPPMENUITEM" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_PSAPPMENUITEMDTO sys_psappmenuitemdto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemService.save(sys_psappmenuitemMapping.toDomain(sys_psappmenuitemdto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_PSAPPMENUITEM" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
@@ -71,10 +69,7 @@ public class SYS_PSAPPMENUITEMResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_PSAPPMENUITEM" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems")
     @Transactional
@@ -85,6 +80,7 @@ public class SYS_PSAPPMENUITEMResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_PSAPPMENUITEM" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
@@ -92,10 +88,7 @@ public class SYS_PSAPPMENUITEMResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_PSAPPMENUITEM" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
     @Transactional
@@ -107,6 +100,7 @@ public class SYS_PSAPPMENUITEMResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_PSAPPMENUITEM" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
@@ -114,30 +108,21 @@ public class SYS_PSAPPMENUITEMResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_PSAPPMENUITEM" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/getdraft")
     public ResponseEntity<SYS_PSAPPMENUITEMDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemMapping.toDto(sys_psappmenuitemService.getDraft(new SYS_PSAPPMENUITEM())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_PSAPPMENUITEM" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_PSAPPMENUITEMDTO sys_psappmenuitemdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemService.checkKey(sys_psappmenuitemMapping.toDomain(sys_psappmenuitemdto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_PSAPPMENUITEM" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
     @Transactional
@@ -145,6 +130,7 @@ public class SYS_PSAPPMENUITEMResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemService.remove(sys_psappmenuitem_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_PSAPPMENUITEM" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -152,10 +138,7 @@ public class SYS_PSAPPMENUITEMResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_PSAPPMENUITEM" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
     public ResponseEntity<SYS_PSAPPMENUITEMDTO> get(@PathVariable("sys_psappmenuitem_id") String sys_psappmenuitem_id) {
@@ -164,7 +147,7 @@ public class SYS_PSAPPMENUITEMResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PSAPPMENUITEM" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_psappmenuitems/fetchdefault")
 	public ResponseEntity<List<SYS_PSAPPMENUITEMDTO>> fetchDefault(SYS_PSAPPMENUITEMSearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_PSAPPMENUITEMResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PSAPPMENUITEM" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_psappmenuitems/searchdefault")
 	public ResponseEntity<Page<SYS_PSAPPMENUITEMDTO>> searchDefault(@RequestBody SYS_PSAPPMENUITEMSearchContext context) {
@@ -185,8 +168,4 @@ public class SYS_PSAPPMENUITEMResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_psappmenuitemMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSDEOPPRIVResource.java

@@ -54,10 +54,7 @@ public class SYS_PSDEOPPRIVResource {
 
     public SYS_PSDEOPPRIVDTO permissionDTO=new SYS_PSDEOPPRIVDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_PSDEOPPRIV" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
     @Transactional
@@ -65,6 +62,7 @@ public class SYS_PSDEOPPRIVResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivService.remove(sys_psdeoppriv_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_PSDEOPPRIV" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -72,30 +70,21 @@ public class SYS_PSDEOPPRIVResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_PSDEOPPRIV" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_PSDEOPPRIVDTO sys_psdeopprivdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivService.checkKey(sys_psdeopprivMapping.toDomain(sys_psdeopprivdto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_PSDEOPPRIV" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/getdraft")
     public ResponseEntity<SYS_PSDEOPPRIVDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivMapping.toDto(sys_psdeopprivService.getDraft(new SYS_PSDEOPPRIV())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_PSDEOPPRIV" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs")
     @Transactional
@@ -106,6 +95,7 @@ public class SYS_PSDEOPPRIVResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_PSDEOPPRIV" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
@@ -113,10 +103,7 @@ public class SYS_PSDEOPPRIVResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_PSDEOPPRIV" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
     public ResponseEntity<SYS_PSDEOPPRIVDTO> get(@PathVariable("sys_psdeoppriv_id") String sys_psdeoppriv_id) {
@@ -125,10 +112,7 @@ public class SYS_PSDEOPPRIVResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_PSDEOPPRIV" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
     @Transactional
@@ -140,6 +124,7 @@ public class SYS_PSDEOPPRIVResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_PSDEOPPRIV" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
@@ -147,16 +132,14 @@ public class SYS_PSDEOPPRIVResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_PSDEOPPRIV" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_PSDEOPPRIVDTO sys_psdeopprivdto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivService.save(sys_psdeopprivMapping.toDomain(sys_psdeopprivdto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_PSDEOPPRIV" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
@@ -164,7 +147,7 @@ public class SYS_PSDEOPPRIVResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PSDEOPPRIV" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_psdeopprivs/fetchdefault")
 	public ResponseEntity<List<SYS_PSDEOPPRIVDTO>> fetchDefault(SYS_PSDEOPPRIVSearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_PSDEOPPRIVResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PSDEOPPRIV" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_psdeopprivs/searchdefault")
 	public ResponseEntity<Page<SYS_PSDEOPPRIVDTO>> searchDefault(@RequestBody SYS_PSDEOPPRIVSearchContext context) {
@@ -185,8 +168,4 @@ public class SYS_PSDEOPPRIVResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_psdeopprivMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

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

@@ -54,16 +54,14 @@ public class SYS_ROLEResource {
 
     public SYS_ROLEDTO permissionDTO=new SYS_ROLEDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_ROLE" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_ROLEDTO sys_roledto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_roleService.save(sys_roleMapping.toDomain(sys_roledto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_ROLE" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
@@ -71,10 +69,7 @@ public class SYS_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_ROLE" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}")
     @Transactional
@@ -86,6 +81,7 @@ public class SYS_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_ROLE" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
@@ -93,10 +89,7 @@ public class SYS_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_ROLE" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles")
     @Transactional
@@ -107,6 +100,7 @@ public class SYS_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_ROLE" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
@@ -114,10 +108,7 @@ public class SYS_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_ROLE" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}")
     public ResponseEntity<SYS_ROLEDTO> get(@PathVariable("sys_role_id") String sys_role_id) {
@@ -126,10 +117,7 @@ public class SYS_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_ROLE" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}")
     @Transactional
@@ -137,6 +125,7 @@ public class SYS_ROLEResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_roleService.remove(sys_role_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_ROLE" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -144,27 +133,21 @@ public class SYS_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_ROLE" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/getdraft")
     public ResponseEntity<SYS_ROLEDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_roleMapping.toDto(sys_roleService.getDraft(new SYS_ROLE())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_ROLE" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_ROLEDTO sys_roledto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_roleService.checkKey(sys_roleMapping.toDomain(sys_roledto)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_roles/fetchdefault")
 	public ResponseEntity<List<SYS_ROLEDTO>> fetchDefault(SYS_ROLESearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_ROLEResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_roles/searchdefault")
 	public ResponseEntity<Page<SYS_ROLEDTO>> searchDefault(@RequestBody SYS_ROLESearchContext context) {
@@ -185,8 +168,4 @@ public class SYS_ROLEResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

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

@@ -54,9 +54,6 @@ public class SYS_ROLE_PERMISSIONResource {
 
     public SYS_ROLE_PERMISSIONDTO permissionDTO=new SYS_ROLE_PERMISSIONDTO();
 
-
-
-
     @PreAuthorize("hasPermission(#sys_role_permission_id,'Get',{'Sql',this.sys_role_permissionMapping,this.permissionDTO})")
     @ApiOperation(value = "Get", tags = {"SYS_ROLE_PERMISSION" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/{sys_role_permission_id}")
@@ -66,9 +63,6 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-
-
-
     @PreAuthorize("hasPermission(#sys_role_permission_id,'Remove',{'Sql',this.sys_role_permissionMapping,this.permissionDTO})")
     @ApiOperation(value = "Remove", tags = {"SYS_ROLE_PERMISSION" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/{sys_role_permission_id}")
@@ -77,6 +71,7 @@ public class SYS_ROLE_PERMISSIONResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.remove(sys_role_permission_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_ROLE_PERMISSION" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -84,19 +79,13 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_ROLE_PERMISSION" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/getdraft")
     public ResponseEntity<SYS_ROLE_PERMISSIONDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionMapping.toDto(sys_role_permissionService.getDraft(new SYS_ROLE_PERMISSION())));
     }
 
-
-
-
     @PreAuthorize("hasPermission('','Create',{'Sql',this.sys_role_permissionMapping,#sys_role_permissiondto})")
     @ApiOperation(value = "Create", tags = {"SYS_ROLE_PERMISSION" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions")
@@ -108,6 +97,7 @@ public class SYS_ROLE_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_ROLE_PERMISSION" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -115,26 +105,21 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_ROLE_PERMISSION" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.checkKey(sys_role_permissionMapping.toDomain(sys_role_permissiondto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_ROLE_PERMISSION" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.save(sys_role_permissionMapping.toDomain(sys_role_permissiondto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_ROLE_PERMISSION" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -142,9 +127,6 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
     @PreAuthorize("hasPermission(#sys_role_permission_id,'Update',{'Sql',this.sys_role_permissionMapping,#sys_role_permissiondto})")
     @ApiOperation(value = "Update", tags = {"SYS_ROLE_PERMISSION" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/{sys_role_permission_id}")
@@ -157,6 +139,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_ROLE_PERMISSION" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -164,7 +147,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/fetchdefault")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchDefault(SYS_ROLE_PERMISSIONSearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_role_permissions/searchdefault")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchDefault(@RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
@@ -185,8 +168,7 @@ public class SYS_ROLE_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
 	@ApiOperation(value = "fetchpermissionenable1", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchpermissionenable1")
     @RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/fetchpermissionenable1")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchPermissionenable1(SYS_ROLE_PERMISSIONSearchContext context) {
@@ -199,7 +181,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
 	@ApiOperation(value = "searchpermissionenable1", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchpermissionenable1")
     @RequestMapping(method= RequestMethod.POST , value="/sys_role_permissions/searchpermissionenable1")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchPermissionenable1(@RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
@@ -207,9 +189,6 @@ public class SYS_ROLE_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
-
     //@PreAuthorize("hasPermission(#sys_role_permission_id,'Get',{'Sql',this.sys_role_permissionMapping,this.permissionDTO})")
     @ApiOperation(value = "GetBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "GetBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/{sys_role_permission_id}")
@@ -227,6 +206,7 @@ public class SYS_ROLE_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.remove(sys_role_permission_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatchBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "RemoveBatchBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/batch")
     public ResponseEntity<Boolean> removeBatchBySYS_PERMISSION(@RequestBody List<String> ids) {
@@ -234,7 +214,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
     @ApiOperation(value = "GetDraftBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "GetDraftBySYS_PERMISSION")
     @RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/getdraft")
     public ResponseEntity<SYS_ROLE_PERMISSIONDTO> getDraftBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id) {
@@ -255,6 +235,7 @@ public class SYS_ROLE_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatchBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "createBatchBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/batch")
     public ResponseEntity<Boolean> createBatchBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -266,14 +247,14 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
     @ApiOperation(value = "CheckKeyBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "CheckKeyBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/checkkey")
     public ResponseEntity<Boolean> checkKeyBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.checkKey(sys_role_permissionMapping.toDomain(sys_role_permissiondto)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
     @ApiOperation(value = "SaveBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "SaveBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/save")
     public ResponseEntity<Boolean> saveBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
@@ -282,6 +263,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.save(domain));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatchBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "SaveBatchBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/savebatch")
     public ResponseEntity<Boolean> saveBatchBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -306,6 +288,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatchBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" },  notes = "UpdateBatchBySYS_PERMISSION")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/batch")
     public ResponseEntity<Boolean> updateBatchBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -317,7 +300,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
 	@ApiOperation(value = "fetchDEFAULTBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchDEFAULTBySYS_PERMISSION")
     @RequestMapping(method= RequestMethod.GET , value="/sys_permissions/{sys_permission_id}/sys_role_permissions/fetchdefault")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchSYS_ROLE_PERMISSIONDefaultBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id,SYS_ROLE_PERMISSIONSearchContext context) {
@@ -331,7 +314,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
 	@ApiOperation(value = "searchDEFAULTBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULTBySYS_PERMISSION")
     @RequestMapping(method= RequestMethod.POST , value="/sys_permissions/{sys_permission_id}/sys_role_permissions/searchdefault")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONDefaultBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
@@ -340,8 +323,7 @@ public class SYS_ROLE_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
 	@ApiOperation(value = "fetchpermissionenable1BySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchpermissionenable1BySYS_PERMISSION")
     @RequestMapping(method= RequestMethod.GET , value="/sys_permissions/{sys_permission_id}/sys_role_permissions/fetchpermissionenable1")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchSYS_ROLE_PERMISSIONPermissionenable1BySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id,SYS_ROLE_PERMISSIONSearchContext context) {
@@ -355,7 +337,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
 	@ApiOperation(value = "searchpermissionenable1BySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchpermissionenable1BySYS_PERMISSION")
     @RequestMapping(method= RequestMethod.POST , value="/sys_permissions/{sys_permission_id}/sys_role_permissions/searchpermissionenable1")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONPermissionenable1BySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
@@ -364,9 +346,6 @@ public class SYS_ROLE_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
-
     //@PreAuthorize("hasPermission(#sys_role_permission_id,'Get',{'Sql',this.sys_role_permissionMapping,this.permissionDTO})")
     @ApiOperation(value = "GetBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "GetBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}/sys_role_permissions/{sys_role_permission_id}")
@@ -384,6 +363,7 @@ public class SYS_ROLE_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.remove(sys_role_permission_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatchBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "RemoveBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}/sys_role_permissions/batch")
     public ResponseEntity<Boolean> removeBatchBySYS_ROLE(@RequestBody List<String> ids) {
@@ -391,7 +371,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
     @ApiOperation(value = "GetDraftBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "GetDraftBySYS_ROLE")
     @RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}/sys_role_permissions/getdraft")
     public ResponseEntity<SYS_ROLE_PERMISSIONDTO> getDraftBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id) {
@@ -412,6 +392,7 @@ public class SYS_ROLE_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatchBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "createBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_role_permissions/batch")
     public ResponseEntity<Boolean> createBatchBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -423,14 +404,14 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
     @ApiOperation(value = "CheckKeyBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "CheckKeyBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_role_permissions/checkkey")
     public ResponseEntity<Boolean> checkKeyBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.checkKey(sys_role_permissionMapping.toDomain(sys_role_permissiondto)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
     @ApiOperation(value = "SaveBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "SaveBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_role_permissions/save")
     public ResponseEntity<Boolean> saveBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
@@ -439,6 +420,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.save(domain));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatchBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "SaveBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_role_permissions/savebatch")
     public ResponseEntity<Boolean> saveBatchBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -463,6 +445,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatchBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" },  notes = "UpdateBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}/sys_role_permissions/batch")
     public ResponseEntity<Boolean> updateBatchBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -474,7 +457,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
 	@ApiOperation(value = "fetchDEFAULTBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchDEFAULTBySYS_ROLE")
     @RequestMapping(method= RequestMethod.GET , value="/sys_roles/{sys_role_id}/sys_role_permissions/fetchdefault")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchSYS_ROLE_PERMISSIONDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id,SYS_ROLE_PERMISSIONSearchContext context) {
@@ -488,7 +471,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
 	@ApiOperation(value = "searchDEFAULTBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULTBySYS_ROLE")
     @RequestMapping(method= RequestMethod.POST , value="/sys_roles/{sys_role_id}/sys_role_permissions/searchdefault")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
@@ -497,8 +480,7 @@ public class SYS_ROLE_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
 	@ApiOperation(value = "fetchpermissionenable1BySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchpermissionenable1BySYS_ROLE")
     @RequestMapping(method= RequestMethod.GET , value="/sys_roles/{sys_role_id}/sys_role_permissions/fetchpermissionenable1")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchSYS_ROLE_PERMISSIONPermissionenable1BySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id,SYS_ROLE_PERMISSIONSearchContext context) {
@@ -512,7 +494,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
 	@ApiOperation(value = "searchpermissionenable1BySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchpermissionenable1BySYS_ROLE")
     @RequestMapping(method= RequestMethod.POST , value="/sys_roles/{sys_role_id}/sys_role_permissions/searchpermissionenable1")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONPermissionenable1BySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
@@ -521,8 +503,4 @@ public class SYS_ROLE_PERMISSIONResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

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

@@ -54,10 +54,7 @@ public class SYS_USERResource {
 
     public SYS_USERDTO permissionDTO=new SYS_USERDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_USER" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{sys_user_id}")
     @Transactional
@@ -65,6 +62,7 @@ public class SYS_USERResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_userService.remove(sys_user_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_USER" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -72,10 +70,7 @@ public class SYS_USERResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_USER" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{sys_user_id}")
     @Transactional
@@ -87,6 +82,7 @@ public class SYS_USERResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_USER" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
@@ -94,20 +90,14 @@ public class SYS_USERResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_USER" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_USERDTO sys_userdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_userService.checkKey(sys_userMapping.toDomain(sys_userdto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_USER" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}")
     public ResponseEntity<SYS_USERDTO> get(@PathVariable("sys_user_id") String sys_user_id) {
@@ -116,16 +106,14 @@ public class SYS_USERResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_USER" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_USERDTO sys_userdto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_userService.save(sys_userMapping.toDomain(sys_userdto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_USER" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
@@ -133,20 +121,14 @@ public class SYS_USERResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_USER" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_users/getdraft")
     public ResponseEntity<SYS_USERDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_userMapping.toDto(sys_userService.getDraft(new SYS_USER())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_USER" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users")
     @Transactional
@@ -157,6 +139,7 @@ public class SYS_USERResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_USER" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
@@ -164,7 +147,7 @@ public class SYS_USERResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_users/fetchdefault")
 	public ResponseEntity<List<SYS_USERDTO>> fetchDefault(SYS_USERSearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_USERResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_users/searchdefault")
 	public ResponseEntity<Page<SYS_USERDTO>> searchDefault(@RequestBody SYS_USERSearchContext context) {
@@ -185,8 +168,4 @@ public class SYS_USERResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_userMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

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

@@ -54,30 +54,21 @@ public class SYS_USER_ROLEResource {
 
     public SYS_USER_ROLEDTO permissionDTO=new SYS_USER_ROLEDTO();
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"SYS_USER_ROLE" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.checkKey(sys_user_roleMapping.toDomain(sys_user_roledto)));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"SYS_USER_ROLE" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/getdraft")
     public ResponseEntity<SYS_USER_ROLEDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleMapping.toDto(sys_user_roleService.getDraft(new SYS_USER_ROLE())));
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
     @ApiOperation(value = "Update", tags = {"SYS_USER_ROLE" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -89,6 +80,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatch", tags = {"SYS_USER_ROLE" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -96,10 +88,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"SYS_USER_ROLE" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -107,6 +96,7 @@ public class SYS_USER_ROLEResource {
          return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.remove(sys_user_role_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatch", tags = {"SYS_USER_ROLE" },  notes = "RemoveBatch")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -114,10 +104,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
     @ApiOperation(value = "Create", tags = {"SYS_USER_ROLE" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles")
     @Transactional
@@ -128,6 +115,7 @@ public class SYS_USER_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatch", tags = {"SYS_USER_ROLE" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -135,10 +123,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
     @ApiOperation(value = "Get", tags = {"SYS_USER_ROLE" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/{sys_user_role_id}")
     public ResponseEntity<SYS_USER_ROLEDTO> get(@PathVariable("sys_user_role_id") String sys_user_role_id) {
@@ -147,16 +132,14 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
     @ApiOperation(value = "Save", tags = {"SYS_USER_ROLE" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/save")
     public ResponseEntity<Boolean> save(@RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
         return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.save(sys_user_roleMapping.toDomain(sys_user_roledto)));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatch", tags = {"SYS_USER_ROLE" },  notes = "SaveBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -164,7 +147,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_user_roles/fetchdefault")
 	public ResponseEntity<List<SYS_USER_ROLEDTO>> fetchDefault(SYS_USER_ROLESearchContext context) {
@@ -177,7 +160,7 @@ public class SYS_USER_ROLEResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sys_user_roles/searchdefault")
 	public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchDefault(@RequestBody SYS_USER_ROLESearchContext context) {
@@ -185,17 +168,14 @@ public class SYS_USER_ROLEResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_user_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
     @ApiOperation(value = "CheckKeyBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "CheckKeyBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles/checkkey")
     public ResponseEntity<Boolean> checkKeyBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.checkKey(sys_user_roleMapping.toDomain(sys_user_roledto)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
     @ApiOperation(value = "GetDraftBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "GetDraftBySYS_ROLE")
     @RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}/sys_user_roles/getdraft")
     public ResponseEntity<SYS_USER_ROLEDTO> getDraftBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id) {
@@ -204,7 +184,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleMapping.toDto(sys_user_roleService.getDraft(domain)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
     @ApiOperation(value = "UpdateBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "UpdateBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -217,6 +197,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatchBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "UpdateBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}/sys_user_roles/batch")
     public ResponseEntity<Boolean> updateBatchBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -228,7 +209,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
     @ApiOperation(value = "RemoveBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "RemoveBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -236,6 +217,7 @@ public class SYS_USER_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.remove(sys_user_role_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatchBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "RemoveBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}/sys_user_roles/batch")
     public ResponseEntity<Boolean> removeBatchBySYS_ROLE(@RequestBody List<String> ids) {
@@ -243,7 +225,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
     @ApiOperation(value = "CreateBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "CreateBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles")
     @Transactional
@@ -255,6 +237,7 @@ public class SYS_USER_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatchBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "createBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles/batch")
     public ResponseEntity<Boolean> createBatchBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -266,7 +249,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
     @ApiOperation(value = "GetBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "GetBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}/sys_user_roles/{sys_user_role_id}")
     public ResponseEntity<SYS_USER_ROLEDTO> getBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @PathVariable("sys_user_role_id") String sys_user_role_id) {
@@ -275,7 +258,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
     @ApiOperation(value = "SaveBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "SaveBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles/save")
     public ResponseEntity<Boolean> saveBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
@@ -284,6 +267,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.save(domain));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatchBySYS_ROLE", tags = {"SYS_USER_ROLE" },  notes = "SaveBatchBySYS_ROLE")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles/savebatch")
     public ResponseEntity<Boolean> saveBatchBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -295,7 +279,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
 	@ApiOperation(value = "fetchDEFAULTBySYS_ROLE", tags = {"SYS_USER_ROLE" } ,notes = "fetchDEFAULTBySYS_ROLE")
     @RequestMapping(method= RequestMethod.GET , value="/sys_roles/{sys_role_id}/sys_user_roles/fetchdefault")
 	public ResponseEntity<List<SYS_USER_ROLEDTO>> fetchSYS_USER_ROLEDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id,SYS_USER_ROLESearchContext context) {
@@ -309,7 +293,7 @@ public class SYS_USER_ROLEResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
 	@ApiOperation(value = "searchDEFAULTBySYS_ROLE", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULTBySYS_ROLE")
     @RequestMapping(method= RequestMethod.POST , value="/sys_roles/{sys_role_id}/sys_user_roles/searchdefault")
 	public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchSYS_USER_ROLEDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_USER_ROLESearchContext context) {
@@ -318,17 +302,14 @@ public class SYS_USER_ROLEResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_user_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
-
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
     @ApiOperation(value = "CheckKeyBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "CheckKeyBySYS_USER")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles/checkkey")
     public ResponseEntity<Boolean> checkKeyBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.checkKey(sys_user_roleMapping.toDomain(sys_user_roledto)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
     @ApiOperation(value = "GetDraftBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "GetDraftBySYS_USER")
     @RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}/sys_user_roles/getdraft")
     public ResponseEntity<SYS_USER_ROLEDTO> getDraftBySYS_USER(@PathVariable("sys_user_id") String sys_user_id) {
@@ -337,7 +318,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleMapping.toDto(sys_user_roleService.getDraft(domain)));
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
     @ApiOperation(value = "UpdateBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "UpdateBySYS_USER")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{sys_user_id}/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -350,6 +331,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "UpdateBatchBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "UpdateBatchBySYS_USER")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{sys_user_id}/sys_user_roles/batch")
     public ResponseEntity<Boolean> updateBatchBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -361,7 +343,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
     @ApiOperation(value = "RemoveBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "RemoveBySYS_USER")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{sys_user_id}/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -369,6 +351,7 @@ public class SYS_USER_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.remove(sys_user_role_id));
     }
 
+    @PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
     @ApiOperation(value = "RemoveBatchBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "RemoveBatchBySYS_USER")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{sys_user_id}/sys_user_roles/batch")
     public ResponseEntity<Boolean> removeBatchBySYS_USER(@RequestBody List<String> ids) {
@@ -376,7 +359,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
     @ApiOperation(value = "CreateBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "CreateBySYS_USER")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles")
     @Transactional
@@ -388,6 +371,7 @@ public class SYS_USER_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "createBatchBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "createBatchBySYS_USER")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles/batch")
     public ResponseEntity<Boolean> createBatchBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -399,7 +383,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
     @ApiOperation(value = "GetBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "GetBySYS_USER")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}/sys_user_roles/{sys_user_role_id}")
     public ResponseEntity<SYS_USER_ROLEDTO> getBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @PathVariable("sys_user_role_id") String sys_user_role_id) {
@@ -408,7 +392,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
     @ApiOperation(value = "SaveBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "SaveBySYS_USER")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles/save")
     public ResponseEntity<Boolean> saveBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
@@ -417,6 +401,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.save(domain));
     }
 
+    @PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
     @ApiOperation(value = "SaveBatchBySYS_USER", tags = {"SYS_USER_ROLE" },  notes = "SaveBatchBySYS_USER")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles/savebatch")
     public ResponseEntity<Boolean> saveBatchBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -428,7 +413,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
 	@ApiOperation(value = "fetchDEFAULTBySYS_USER", tags = {"SYS_USER_ROLE" } ,notes = "fetchDEFAULTBySYS_USER")
     @RequestMapping(method= RequestMethod.GET , value="/sys_users/{sys_user_id}/sys_user_roles/fetchdefault")
 	public ResponseEntity<List<SYS_USER_ROLEDTO>> fetchSYS_USER_ROLEDefaultBySYS_USER(@PathVariable("sys_user_id") String sys_user_id,SYS_USER_ROLESearchContext context) {
@@ -442,7 +427,7 @@ public class SYS_USER_ROLEResource {
                 .body(list);
 	}
 
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
 	@ApiOperation(value = "searchDEFAULTBySYS_USER", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULTBySYS_USER")
     @RequestMapping(method= RequestMethod.POST , value="/sys_users/{sys_user_id}/sys_user_roles/searchdefault")
 	public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchSYS_USER_ROLEDefaultBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody SYS_USER_ROLESearchContext context) {
@@ -451,8 +436,4 @@ public class SYS_USER_ROLEResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(sys_user_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
-
-
 }
-
-

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java

@@ -10,8 +10,6 @@ import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.domain.MappingBase;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
-import cn.ibizlab.util.filter.QueryBuildContext;
-import cn.ibizlab.util.filter.QueryWrapperContext;
 import cn.ibizlab.util.helper.DEFieldCacheMap;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -50,24 +48,83 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
     @Lazy
     private MongoTemplate mongoTemplate;
 
-
+    /**
+     * 批处理权限检查[createBatch:updateBatch:removeBatch]
+     * @param authentication
+     * @param DEAction
+     * @param params
+     * @return
+     */
     @Override
-    public boolean hasPermission(Authentication authentication, Object deAction, Object gridParam) {
+    public boolean hasPermission(Authentication authentication, Object DEAction, Object params) {
+
+        //未开启权限校验、超级管理员则不进行权限检查
+        if(AuthenticationUser.getAuthenticationUser().getSuperuser()==1  || !enablePermissionValid)
+            return true;
+        List paramList = (ArrayList) params;
+        String deStorageMode= (String) paramList.get(0);
+        String action=String.valueOf(DEAction);
+        List<String> ids=null;
+        EntityBase entity;
+        List<EntityBase> entityList = null;
+        JSONObject userPermission= AuthenticationUser.getAuthenticationUser().getPermissionList();
+        if(userPermission==null)
+            return false;
+        MappingBase mappingBase= (MappingBase) paramList.get(1);
+        //参数准备
+        if(action.equalsIgnoreCase("remove")){
+            entity= (EntityBase) mappingBase.toDomain(paramList.get(2));
+            ids= (List<String>) paramList.get(3);
+        }
+        else{
+            List<DTOBase> dtoList = (List<DTOBase>) paramList.get(2);
+            if(dtoList.size()==0)
+                return false;
+            entityList =mappingBase.toDomain(dtoList);
+            entity = (EntityBase) mappingBase.toDomain(dtoList.get(0));
+        }
+        if (entity==null)
+            return false;
+
+        JSONObject permissionList=userPermission.getJSONObject("entities");
+        String entityName = entity.getClass().getSimpleName();
+
+        //拥有全部数据访问权限时，则跳过权限检查
+        if(isAllData(entityName,action,permissionList)){
             return true;
         }
+        //检查是否有操作权限[create.update.delete.read]
+        if(!validDEActionHasPermission(entityName,action,permissionList)){
+            return false;
+        }
+        JSONArray dataRangeList=getDataRange(entityName,action,permissionList);
+        if(dataRangeList.size()==0)
+            return false;
 
+        if(action.equalsIgnoreCase("create")){
+            return createBatchActionPermissionValid(entityList,dataRangeList);
+        }
+        else{
+            if(!action.equalsIgnoreCase("remove")){
+                ids=getIds(entity,entityList);
+            }
+            if(ids.size()==0)
+                return false;
+            return otherBatchActionPermissionValidRouter(deStorageMode, entity ,ids, dataRangeList);
+        }
+    }
 
     /**
      * 实体行为权限检查 ：用于检查当前用户是否拥有实体的新建、编辑、删除权限
      *
      * @param authentication
-     * @param srfKey         当前操作数据的主键
+     * @param id         当前操作数据的主键
      * @param action         当前操作行为：如：[READ、UPDATE、DELETE]
      * @param params         相关参数
      * @return true/false true则允许当前行为，false拒绝行为
      */
     @Override
-    public boolean hasPermission(Authentication authentication, Serializable srfKey, String action, Object params) {
+    public boolean hasPermission(Authentication authentication, Serializable id, String action, Object params) {
 
         //未开启权限校验、超级管理员则不进行权限检查
         if(AuthenticationUser.getAuthenticationUser().getSuperuser()==1  || !enablePermissionValid)
@@ -83,22 +140,118 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
             return false;
 
         JSONObject userPermission= AuthenticationUser.getAuthenticationUser().getPermissionList();
+        if(userPermission==null)
+            return false;
         JSONObject permissionList=userPermission.getJSONObject("entities");
         String entityName = entity.getClass().getSimpleName();
 
         //拥有全部数据访问权限时，则跳过权限检查
-        if(isAllData(permissionList,entityName,action)){
+        if(isAllData(entityName,action,permissionList)){
             return true;
         }
         //检查是否有操作权限[create.update.delete.read]
-        if(!validDEActionHasPermission(permissionList,entityName,action)){
+        if(!validDEActionHasPermission(entityName,action,permissionList)){
             return false;
         }
+        JSONArray dataRangeList=getDataRange(entityName,action,permissionList);
+        if(dataRangeList.size()==0)
+            return false;
+
         if(action.equalsIgnoreCase("create")){
-            return createActionPermissionValid(permissionList,entity, action);
+            return createActionPermissionValid(entity,dataRangeList);
         }
         else{
-            return otherActionPermissionValidRouter(deStorageMode, entity , action , srfKey, permissionList);
+            return otherActionPermissionValidRouter(deStorageMode, entity, id, dataRangeList);
+        }
+    }
+
+    /**
+     * 批处理新建权限校验
+     * @param entityList
+     * @param dataRangeList
+     * @return
+     */
+    private boolean createBatchActionPermissionValid(List<EntityBase> entityList,JSONArray dataRangeList){
+        for(EntityBase entity : entityList){
+            boolean isCreate = createActionPermissionValid(entity ,dataRangeList);
+            if(!isCreate){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 批处理行为权限校验[get:update:delete]
+     * @param deStorageMode
+     * @param entity
+     * @param ids
+     * @param dataRangeList
+     * @return
+     */
+    private boolean otherBatchActionPermissionValidRouter(String deStorageMode , EntityBase entity , List<String> ids , JSONArray dataRangeList){
+
+        if(deStorageMode.equalsIgnoreCase("sql")){
+            return sqlBatchPermissionValid(entity ,ids, dataRangeList);
+        }
+        else if(deStorageMode.equalsIgnoreCase("nosql")){
+            return noSqlBatchPermissionValid(entity, ids , dataRangeList);
+        }
+        else if(deStorageMode.equalsIgnoreCase("serviceapi")){
+            return true;
+        }
+        else {
+            throw new RuntimeException(String.format("未能识别实体对应存储模式[%s]",deStorageMode));
+        }
+    }
+
+    /**
+     * SQL批处理权限校验
+     * @param entity
+     * @param ids
+     * @param dataRangeList
+     * @return
+     */
+    private boolean sqlBatchPermissionValid(EntityBase entity , List<String> ids,  JSONArray dataRangeList){
+
+        Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
+        String keyFieldName=permissionField.get(keyFieldTag);
+        ServiceImpl service= SpringContextHolder.getBean(String.format("%s%s",entity.getClass().getSimpleName(),"ServiceImpl"));//获取实体service对象
+        //通过权限表达式来获取sql
+        String permissionSQL= String.format(" (%s) AND ( %s in (%s) ) ",getPermissionSQL(entity,dataRangeList),keyFieldName,getEntityKeyCond(ids)); //拼接权限条件-编辑
+        //执行sql进行权限检查
+        QueryWrapper permissionWrapper=getPermissionWrapper(permissionSQL);//构造权限条件
+        List list=service.list(permissionWrapper);
+        if(list.size() == ids.size()){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * NoSQL批处理权限校验
+     * @param entity
+     * @param ids
+     * @param dataRange
+     * @return
+     */
+    private boolean noSqlBatchPermissionValid(EntityBase entity, List<String> ids,  JSONArray dataRange) {
+
+        Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
+        String keyFieldName=permissionField.get(keyFieldTag);
+        //根据权限表达式填充权限条件
+        QueryBuilder permissionCond=getNoSqlPermissionCond(entity,dataRange);
+        //权限条件拼接主键
+        permissionCond.and(keyFieldName).in(ids);
+        //执行权限检查
+        Query query = new BasicQuery(permissionCond.get().toString());
+        List list=mongoTemplate.find(query,entity.getClass());
+        if(list.size()==ids.size()){
+            return true;
+        }
+        else{
+            return false;
         }
     }
 
@@ -109,7 +262,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
      * @param action
      * @return
      */
-    private boolean isAllData(JSONObject permissionList, String entityName, String action) {
+    private boolean isAllData( String entityName, String action ,JSONObject permissionList) {
 
         if(permissionList==null)
             return false;
@@ -133,7 +286,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
      * userPermission:{"ENTITY":{"DEACTION":{"READ":["CURORG"]},"DATASET":{"Default":["CURORG"]}}}
      * @return
      */
-    private boolean validDEActionHasPermission(JSONObject userPermission,String entityName , String action ){
+    private boolean validDEActionHasPermission(String entityName , String action ,JSONObject userPermission){
 
         boolean hasPermission=false;
         if(userPermission==null)
@@ -152,28 +305,14 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
 
     /**
      * 新建行为校验
-     * @param permissionList
      * @param entity
-     * @param action
+     * @param dataRangeList
      * @return
      */
-    private boolean createActionPermissionValid(JSONObject permissionList,EntityBase entity, String action){
-
-        Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
-        String keyField=permissionField.get(keyFieldTag);
-        if(StringUtils.isEmpty(keyField)){
-            throw new RuntimeException("权限校验失败，请检查当前实体中是否已经配置主键属性!");
-        }
-
-        //获取权限表达式[全部数据、本单位、本部门等]
-        JSONObject entityObj=permissionList.getJSONObject(entity.getClass().getSimpleName());//获取实体
-        JSONObject permissionType= entityObj.getJSONObject(DEActionType);
-        JSONArray dataRangeList=permissionType.getJSONArray(action);//行为：read；insert...
-        if(dataRangeList.size()==0)
-            return false;
+    private boolean createActionPermissionValid(EntityBase entity, JSONArray dataRangeList){
 
         boolean isCreate=true;
-
+        Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
         String orgField=permissionField.get("orgfield");
         String orgDeptField=permissionField.get("orgsecfield");
         String createManField=permissionField.get("createmanfield");
@@ -230,18 +369,17 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
      * 根据实体存储模式，进行鉴权
      * @param deStorageMode
      * @param entity
-     * @param action
-     * @param srfKey
-     * @param permissionList
+     * @param id
+     * @param dataRangeList
      * @return
      */
-    private boolean otherActionPermissionValidRouter(String deStorageMode, EntityBase entity , String action , Object srfKey , JSONObject permissionList){
+    private boolean otherActionPermissionValidRouter(String deStorageMode, EntityBase entity , Object id , JSONArray dataRangeList){
 
         if(deStorageMode.equalsIgnoreCase("sql")){
-            return sqlPermissionValid(entity , action , srfKey, permissionList);
+            return sqlPermissionValid(entity , id, dataRangeList);
         }
         else if(deStorageMode.equalsIgnoreCase("nosql")){
-            return noSqlPermissionValid(entity , action , srfKey, permissionList);
+            return noSqlPermissionValid(entity , id, dataRangeList);
         }
         else if(deStorageMode.equalsIgnoreCase("serviceapi")){
             return true;
@@ -254,32 +392,16 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
     /**
      * sql存储模式实体行为鉴权
      * @param entity
-     * @param action
-     * @param srfKey
-     * @param permissionList
+     * @param id
+     * @param dataRangeList
      * @return
      */
-    private boolean sqlPermissionValid(EntityBase entity , String action , Object srfKey, JSONObject permissionList){
-
-        String entityName=entity.getClass().getSimpleName();
-        ServiceImpl service= SpringContextHolder.getBean(String.format("%s%s",entityName,"ServiceImpl"));//获取实体service对象
+    private boolean sqlPermissionValid(EntityBase entity , Object id, JSONArray dataRangeList){
 
+        ServiceImpl service= SpringContextHolder.getBean(String.format("%s%s",entity.getClass().getSimpleName(),"ServiceImpl"));//获取实体service对象
         Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
-        String keyField=permissionField.get(keyFieldTag);
-        if(StringUtils.isEmpty(keyField)){
-            throw new RuntimeException("权限校验失败，请检查当前实体中是否已经配置主键属性!");
-        }
-
-        //获取权限表达式[全部数据、本单位、本部门等]
-        JSONObject entityObj=permissionList.getJSONObject(entity.getClass().getSimpleName());//获取实体
-        JSONObject permissionType= entityObj.getJSONObject(DEActionType);
-        JSONArray opprivList=permissionType.getJSONArray(action);//行为：read；insert...
-        if(opprivList.size()==0)
-            return false;
-
         //通过权限表达式来获取sql
-        String tempPermissionSQL=getPermissionSQL(entity,opprivList);
-        String permissionSQL= String.format(" (%s) AND (%s='%s')",tempPermissionSQL,keyField,srfKey); //拼接权限条件-编辑
+        String permissionSQL= String.format(" (%s) AND (%s='%s')",getPermissionSQL(entity,dataRangeList),permissionField.get(keyFieldTag),id); //拼接权限条件-编辑
         //执行sql进行权限检查
         QueryWrapper permissionWrapper=getPermissionWrapper(permissionSQL);//构造权限条件
         List list=service.list(permissionWrapper);
@@ -294,32 +416,18 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
     /**
      * NoSQL实体行为鉴权
      * @param entity
-     * @param action
-     * @param srfKey
-     * @param permissionList
+     * @param id
+     * @param dataRangeList
      * @return
      */
-    private boolean noSqlPermissionValid(EntityBase entity, String action, Object srfKey, JSONObject permissionList) {
+    private boolean noSqlPermissionValid(EntityBase entity, Object id, JSONArray dataRangeList) {
 
         Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
-
         String keyField=permissionField.get(keyFieldTag);
-        if(StringUtils.isEmpty(keyField)){
-            throw new RuntimeException("权限校验失败，请检查当前实体中是否已经配置主键属性!");
-        }
-
-        //获取权限表达式[全部数据、本单位、本部门等]
-        JSONObject entityObj=permissionList.getJSONObject(entity.getClass().getSimpleName());//获取实体
-        JSONObject permissionType= entityObj.getJSONObject(DEActionType);
-        JSONArray dataRange=permissionType.getJSONArray(action);//行为：read；insert...
-        if(dataRange.size()==0)
-            return false;
-
         //根据权限表达式填充权限条件
-        QueryBuilder permissionCond=new QueryBuilder();
-        fillNoSqlPermissionCond(dataRange,entity,permissionCond);
+        QueryBuilder permissionCond=getNoSqlPermissionCond(entity,dataRangeList);
         //权限条件拼接主键
-        permissionCond.and(keyField).is(srfKey);
+        permissionCond.and(keyField).is(id);
         //执行权限检查
         Query query = new BasicQuery(permissionCond.get().toString());
         List list=mongoTemplate.find(query,entity.getClass());
@@ -334,12 +442,13 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
 
     /**
      * 为NoSQL存储模式的表格查询填充权限条件
-     * @param oppriList
      * @param entity
-     * @param permissionSQL
+     * @param dataRangeList
+     * @return
      */
-    private void fillNoSqlPermissionCond(JSONArray oppriList, EntityBase entity, QueryBuilder permissionSQL){
+    private QueryBuilder getNoSqlPermissionCond( EntityBase entity ,JSONArray dataRangeList ){
 
+        QueryBuilder permissionSQL=new QueryBuilder();
         Map<String,String> permissionField=getPermissionField(entity);//获取组织、部门预置属性
         String orgField=permissionField.get("orgfield");
         String orgDeptField=permissionField.get("orgsecfield");
@@ -351,8 +460,8 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         Set<String> orgDeptParent = userInfo.get("parentdept");
         Set<String> orgDeptChild = userInfo.get("subdept");
 
-        for(int i=0;i<oppriList.size();i++){
-            String permissionCond=oppriList.getString(i);//权限配置条件
+        for(int i=0;i<dataRangeList.size();i++){
+            String permissionCond=dataRangeList.getString(i);//权限配置条件
             if(permissionCond.equals("curorg")){   //本单位
                 permissionSQL.or(new QueryBuilder().and(orgField).is(AuthenticationUser.getAuthenticationUser().getOrgid()).get());
             }
@@ -378,6 +487,8 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
                 permissionSQL.or(new QueryBuilder().get());
             }
         }
+
+        return permissionSQL;
     }
 
     /**
@@ -530,4 +641,53 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         return resultCond;
     }
 
+
+    /**
+     * 转换[a,b]格式字符串到 'a','b'格式
+     *
+     * @return
+     */
+    private String getEntityKeyCond(List<String> array) {
+        String[] arr = array.toArray(new String[array.size()]);
+        return "'" + String.join("','", arr) + "'";
+    }
+
+    /**
+     * 获取数据范围
+     * @param entityName
+     * @param action
+     * @param permissionList
+     * @return
+     */
+    private JSONArray getDataRange(String entityName, String action , JSONObject permissionList){
+        //获取权限表达式[全部数据、本单位、本部门等]
+        JSONObject entityObj=permissionList.getJSONObject(entityName);//获取实体
+        JSONObject permissionType= entityObj.getJSONObject(DEActionType);
+        JSONArray  dataRangeList=permissionType.getJSONArray(action);//行为：read；insert...
+        return dataRangeList;
+    }
+
+    /**
+     * 获取实体主键集合
+     * @param entityBase
+     * @param entityList
+     * @return
+     */
+    private List<String> getIds(EntityBase entityBase ,List<EntityBase> entityList) {
+
+        List<String> entityKeyList=new ArrayList<>();
+        Map<String,String> permissionField=getPermissionField(entityBase);//获取组织、部门预置属性
+        String keyFieldName=permissionField.get(keyFieldTag);
+        if(StringUtils.isEmpty(keyFieldName))
+            return entityKeyList;
+
+        for(EntityBase entity: entityList){
+            Object objEntityKey = entity.get(keyFieldName);
+            if(!ObjectUtils.isEmpty(objEntityKey)){
+                entityKeyList.add(String.valueOf(objEntityKey));
+            }
+        }
+        return entityKeyList;
+    }
+
 }
\ No newline at end of file