ibiz4j 发布系统代码

app_web/src/components/app-form-group/app-form-group.less

@@ -9,6 +9,7 @@
     }
     >.ivu-card-extra {
         .item-extract-mode {
+            display: flex;
             .item {
                 margin-left: 12px;
             }

app_web/src/locale/lanres/wfprocess-definition/wfprocess-definition_en_US.ts

@@ -6,6 +6,7 @@ export default {
     modelversion: '模型版本',
     modelenable: '模型是否启用',
     pssystemid: '系统标识',
+    taskprocessdefinitionkey: 'TaskDefinitionKey',
     md5check: '校验',
     bpmnfile: 'BPMN',
     deploykey: 'DeployKey',

app_web/src/locale/lanres/wfprocess-definition/wfprocess-definition_zh_CN.ts

@@ -5,6 +5,7 @@ export default {
     modelversion: '模型版本',
     modelenable: '模型是否启用',
     pssystemid: '系统标识',
+    taskprocessdefinitionkey: 'TaskDefinitionKey',
     md5check: '校验',
     bpmnfile: 'BPMN',
     deploykey: 'DeployKey',

app_web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view-base.vue

@@ -562,46 +562,46 @@ export default class WFGroupEditViewBase 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, 'tbitem7')) {
-            this.toolbar_tbitem7_click($event, '', $event2);
+            this.toolbar_tbitem7_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);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_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, 'tbitem26')) {
-            this.toolbar_tbitem26_click($event, '', $event2);
+            this.toolbar_tbitem26_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem22')) {
-            this.toolbar_tbitem22_click($event, '', $event2);
+            this.toolbar_tbitem22_click(null, '', $event2);
         }
     }
 
@@ -665,6 +665,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -691,6 +694,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndNew(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -717,6 +723,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -743,6 +752,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -769,6 +781,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -795,6 +810,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -821,6 +839,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -847,6 +868,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -873,6 +897,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -899,6 +926,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -925,6 +955,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.PrevRecord(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -951,6 +984,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NextRecord(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -977,6 +1013,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.LastRecord(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -1003,6 +1042,9 @@ export default class WFGroupEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }

app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-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">
@@ -605,43 +605,43 @@ export default class WFGroupGridViewBase 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, 'tbitem21')) {
-            this.toolbar_tbitem21_click($event, '', $event2);
+            this.toolbar_tbitem21_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click($event, '', $event2);
+            this.toolbar_tbitem18_click(null, '', $event2);
         }
     }
 
@@ -765,6 +765,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -791,6 +794,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -817,6 +823,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -843,6 +852,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -869,6 +881,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -895,6 +910,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -921,6 +939,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -947,6 +968,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -973,6 +997,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -999,6 +1026,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportModel(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -1025,6 +1055,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Import(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -1051,6 +1084,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
@@ -1077,6 +1113,9 @@ export default class WFGroupGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }

app_web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view-base.vue

@@ -562,46 +562,46 @@ export default class WFMemberEditViewBase 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, 'tbitem7')) {
-            this.toolbar_tbitem7_click($event, '', $event2);
+            this.toolbar_tbitem7_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);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_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, 'tbitem26')) {
-            this.toolbar_tbitem26_click($event, '', $event2);
+            this.toolbar_tbitem26_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem22')) {
-            this.toolbar_tbitem22_click($event, '', $event2);
+            this.toolbar_tbitem22_click(null, '', $event2);
         }
     }
 
@@ -665,6 +665,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -691,6 +694,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndNew(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -717,6 +723,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -743,6 +752,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -769,6 +781,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -795,6 +810,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -821,6 +839,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -847,6 +868,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -873,6 +897,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -899,6 +926,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -925,6 +955,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.PrevRecord(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -951,6 +984,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NextRecord(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -977,6 +1013,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.LastRecord(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -1003,6 +1042,9 @@ export default class WFMemberEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }

app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-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">
@@ -605,43 +605,43 @@ export default class WFMemberGridViewBase 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, 'tbitem21')) {
-            this.toolbar_tbitem21_click($event, '', $event2);
+            this.toolbar_tbitem21_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click($event, '', $event2);
+            this.toolbar_tbitem18_click(null, '', $event2);
         }
     }
 
@@ -765,6 +765,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -791,6 +794,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -817,6 +823,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -843,6 +852,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -869,6 +881,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -895,6 +910,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -921,6 +939,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -947,6 +968,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -973,6 +997,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -999,6 +1026,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportModel(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -1025,6 +1055,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Import(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -1051,6 +1084,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
@@ -1077,6 +1113,9 @@ export default class WFMemberGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }

app_web/src/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view-base.vue

@@ -562,46 +562,46 @@ export default class WFProcessDefinitionEditViewBase 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, 'tbitem7')) {
-            this.toolbar_tbitem7_click($event, '', $event2);
+            this.toolbar_tbitem7_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);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_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, 'tbitem26')) {
-            this.toolbar_tbitem26_click($event, '', $event2);
+            this.toolbar_tbitem26_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem22')) {
-            this.toolbar_tbitem22_click($event, '', $event2);
+            this.toolbar_tbitem22_click(null, '', $event2);
         }
     }
 
@@ -665,6 +665,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -691,6 +694,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndNew(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -717,6 +723,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -743,6 +752,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -769,6 +781,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -795,6 +810,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -821,6 +839,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -847,6 +868,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -873,6 +897,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -899,6 +926,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -925,6 +955,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.PrevRecord(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -951,6 +984,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NextRecord(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -977,6 +1013,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.LastRecord(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -1003,6 +1042,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }

app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-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">
@@ -605,43 +605,43 @@ export default class WFProcessDefinitionGridViewBase 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, 'tbitem21')) {
-            this.toolbar_tbitem21_click($event, '', $event2);
+            this.toolbar_tbitem21_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click($event, '', $event2);
+            this.toolbar_tbitem18_click(null, '', $event2);
         }
     }
 
@@ -765,6 +765,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -791,6 +794,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -817,6 +823,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -843,6 +852,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -869,6 +881,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -895,6 +910,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -921,6 +939,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -947,6 +968,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -973,6 +997,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -999,6 +1026,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportModel(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -1025,6 +1055,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Import(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -1051,6 +1084,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
@@ -1077,6 +1113,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }

app_web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view-base.vue

@@ -467,7 +467,7 @@ export default class WFREModelEditViewBase extends Vue {
      */
     public toolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'tbitem1')) {
-            this.toolbar_tbitem1_click($event, '', $event2);
+            this.toolbar_tbitem1_click(null, '', $event2);
         }
     }
 
@@ -531,6 +531,9 @@ export default class WFREModelEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFREModel");
     }

app_web/src/pages/workflow/wfuser-edit-view/wfuser-edit-view-base.vue

@@ -562,46 +562,46 @@ export default class WFUserEditViewBase 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, 'tbitem7')) {
-            this.toolbar_tbitem7_click($event, '', $event2);
+            this.toolbar_tbitem7_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);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_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, 'tbitem26')) {
-            this.toolbar_tbitem26_click($event, '', $event2);
+            this.toolbar_tbitem26_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem22')) {
-            this.toolbar_tbitem22_click($event, '', $event2);
+            this.toolbar_tbitem22_click(null, '', $event2);
         }
     }
 
@@ -665,6 +665,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -691,6 +694,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndNew(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -717,6 +723,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -743,6 +752,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -769,6 +781,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -795,6 +810,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -821,6 +839,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -847,6 +868,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -873,6 +897,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -899,6 +926,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -925,6 +955,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.PrevRecord(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -951,6 +984,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NextRecord(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -977,6 +1013,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.LastRecord(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -1003,6 +1042,9 @@ export default class WFUserEditViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }

app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-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">
@@ -605,43 +605,43 @@ export default class WFUserGridViewBase 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, 'tbitem21')) {
-            this.toolbar_tbitem21_click($event, '', $event2);
+            this.toolbar_tbitem21_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click($event, '', $event2);
+            this.toolbar_tbitem23_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click($event, '', $event2);
+            this.toolbar_tbitem19_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click($event, '', $event2);
+            this.toolbar_tbitem18_click(null, '', $event2);
         }
     }
 
@@ -765,6 +765,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.New(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -791,6 +794,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Edit(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -817,6 +823,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.View(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -843,6 +852,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Copy(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -869,6 +881,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleRowEdit(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -895,6 +910,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -921,6 +939,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Remove(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -947,6 +968,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -973,6 +997,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Print(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -999,6 +1026,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ExportModel(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -1025,6 +1055,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Import(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -1051,6 +1084,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }
@@ -1077,6 +1113,9 @@ export default class WFUserGridViewBase extends Vue {
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
+        if(params){
+          datas = [params];
+        }
         // 界面行为
         this.Help(datas, contextJO,paramJO,  $event, xData,this,"WFUser");
     }

app_web/src/widgets/control-service.ts

 import { Store } from 'vuex';
 import { Util } from '@/utils/util/util';
+import CodeListService from "@service/app/codelist-service";
 
 /**
  * 部件服务基类
@@ -26,6 +27,14 @@ export default class ControlService {
      */
     public model: any | null = null;
 
+    /**
+     * 代码表服务对象
+     *
+     * @type {any}
+     * @memberof ControlService
+     */  
+    public codeListService:any;
+
     /**
      * 是否为从数据模式
      *
@@ -43,6 +52,7 @@ export default class ControlService {
     constructor(opts: any = {}) {
         this.$store = opts.$store;
         this.setTempMode();
+        this.codeListService = new CodeListService({ $store:opts.$store });
     }
 
     /**
@@ -118,17 +128,19 @@ export default class ControlService {
      * @param {*} response
      * @memberof ControlService
      */
-    public handleResponse(action: string, response: any,isCreate:boolean = false){
+    public async handleResponse(action: string, response: any,isCreate:boolean = false){
         let result = null;
         if (!response.data) {
             return
-        } else if (response.data instanceof Array) {
+        }
+        const handleResult:any = (action: string, response: any,isCreate:boolean,codelistArray?:any) =>{
+            if (response.data instanceof Array) {
                 result = [];
                 response.data.forEach((item:any) =>{
-                result.push(this.handleResponseData(action, item, isCreate));
+                    result.push(this.handleResponseData(action, item, isCreate,codelistArray));
                 });
             }else{
-            result = this.handleResponseData(action, response.data, isCreate);
+                result = this.handleResponseData(action, response.data, isCreate,codelistArray);
             }
             // response状态，头文件
             if(response.headers){
@@ -144,6 +156,14 @@ export default class ControlService {
             }
             response.data = result;
         }
+        let codelistModel:Array<any> = this.handleCodelist();
+        if(codelistModel.length >0){
+            let res:any = await this.getAllCodeList(codelistModel);
+            handleResult(action, response,isCreate,res);
+        }else{
+            handleResult(action, response,isCreate);
+        }
+    }
 
     /**
      * 处理返回数据
@@ -152,7 +172,7 @@ export default class ControlService {
      * @param {*} response
      * @memberof ControlService
      */
-    public handleResponseData(action: string, data: any = {},isCreate?:boolean){
+    public handleResponseData(action: string, data: any = {},isCreate?:boolean,codelistArray?:any){
         let model: any = this.getMode();
         if (!model && model.getDataItems instanceof Function) {
             return data;
@@ -167,10 +187,13 @@ export default class ControlService {
             if((isCreate === undefined || isCreate === null ) && Object.is(dataitem.dataType, 'GUID') && Object.is(dataitem.name, 'srfkey') && (val && !Object.is(val, ''))){
                 isCreate = true;
             }
-            // if((Object.is(dataitem.dataType,'DATE') || Object.is(dataitem.dataType,'DATETIME')) && !Object.is(Date.parse(val),NaN)){
-            //     val = Util.dateFormat(new Date(val));
-            // }
             item[dataitem.name] = val;
+            // 转化代码表
+            if(codelistArray && dataitem.codelist){
+                if(codelistArray.get(dataitem.codelist.tag) && codelistArray.get(dataitem.codelist.tag).get(val)){
+                    item[dataitem.name] = codelistArray.get(dataitem.codelist.tag).get(val);
+                }
+            }
         });
         item.srfuf = data.srfuf ? data.srfuf : (isCreate ? "0" : "1");
         return item;
@@ -199,4 +222,88 @@ export default class ControlService {
         return requestData;
     }
 
+    /**
+     * 处理代码表
+     * 
+     * @memberof ControlService
+     */
+    public handleCodelist(){
+        let model: any = this.getMode();
+        if (!model) {
+            return [];
+        }
+        let dataItems: any[] = model.getDataItems();
+        let codelistMap:Map<string,any> = new Map();
+        if(dataItems && dataItems.length >0){
+            dataItems.forEach((item:any) =>{
+                if(item.codelist){
+                    codelistMap.set(item.name,item.codelist);
+                }
+            })
+        }
+        if(codelistMap.size >0){
+            return  Array.from(codelistMap).map(item => item[1]);
+        }else{
+            return [];
+        }
+    }
+
+    /**
+     * 获取所有代码表
+     * 
+     * @param codelistArray 代码表模型数组
+     * @memberof ControlService
+     */
+    public getAllCodeList(codelistArray:Array<any>):Promise<any>{
+        return new Promise((resolve:any,reject:any) =>{
+            let codeListMap:Map<string,any> = new Map();
+            let promiseArray:Array<any> = [];
+            codelistArray.forEach((item:any) =>{
+                if(!codeListMap.get(item.tag)){
+                    promiseArray.push(this.getCodeList(item));
+                    Promise.all(promiseArray).then((result:any) =>{
+                        if(result && result.length >0){
+                            result.forEach((codeList:any) =>{
+                                let tempCodeListMap:Map<number,any> = new Map();
+                                if(codeList.length >0){
+                                    codeList.forEach((codeListItem:any) =>{
+                                        tempCodeListMap.set(codeListItem.value,codeListItem.text);
+                                    })
+                                }
+                                codeListMap.set(item.tag,tempCodeListMap);       
+                            })
+                            resolve(codeListMap);
+                        }
+                    })
+                }
+            })
+        })
+    }
+
+    /**
+     * 获取代码表
+     * 
+     * @param codeListObject 传入代码表对象
+     * @memberof ControlService
+     */
+    public getCodeList(codeListObject:any):Promise<any>{
+        return new Promise((resolve:any,reject:any) =>{
+            if(codeListObject.tag && Object.is(codeListObject.codelistType,"STATIC")){
+                const codelist = (this.getStore() as Store<any>).getters.getCodeList(codeListObject.tag);
+                if (codelist) {
+                    resolve([...JSON.parse(JSON.stringify(codelist.items))]);
+                } else {
+                    resolve([]);
+                    console.log(`----${codeListObject.tag}----代码表不存在`);
+                }
+            }else if(codeListObject.tag && Object.is(codeListObject.codelistType,"DYNAMIC")){
+                this.codeListService.getItems(codeListObject.tag).then((res:any) => {
+                    resolve(res);
+                }).catch((error:any) => {
+                    resolve([]);
+                    console.log(`----${codeListObject.tag}----代码表不存在`);
+                });
+            }
+        })
+    }
 }
\ No newline at end of file

app_web/src/widgets/wfgroup/main-form/main-form-base.vue

@@ -4,7 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfgroup.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfgroup.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.groupname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='groupname' :itemRules="this.rules.groupname" class='' :caption="$t('entities.wfgroup.main_form.details.groupname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.groupname.error" :isEmptyCaption="false" labelPos="LEFT">

app_web/src/widgets/wfmember/main-form/main-form-base.vue

@@ -4,7 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfmember.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfmember.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.personname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='personname' :itemRules="this.rules.personname" class='' :caption="$t('entities.wfmember.main_form.details.personname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.personname.error" :isEmptyCaption="false" labelPos="LEFT">

app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue

@@ -4,7 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfprocessdefinition.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfprocessdefinition.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.deploykey.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='deploykey' :itemRules="this.rules.deploykey" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.deploykey')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deploykey.error" :isEmptyCaption="false" labelPos="LEFT">

app_web/src/widgets/wfremodel/main-form/main-form-base.vue

@@ -4,7 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfremodel.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfremodel.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.bpmnfile.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='bpmnfile' :itemRules="this.rules.bpmnfile" class='' :caption="$t('entities.wfremodel.main_form.details.bpmnfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.bpmnfile.error" :isEmptyCaption="false" labelPos="LEFT">

app_web/src/widgets/wfuser/main-form/main-form-base.vue

@@ -4,7 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfuser.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfuser.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.personname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='personname' :itemRules="this.rules.personname" class='' :caption="$t('entities.wfuser.main_form.details.personname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.personname.error" :isEmptyCaption="false" labelPos="LEFT">

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFHistory.java

+package cn.ibizlab.core.workflow.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.util.domain.EntityBase;
+import cn.ibizlab.util.annotation.DEField;
+import cn.ibizlab.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.util.enums.DEFieldDefaultValueType;
+import java.io.Serializable;
+import lombok.Data;
+import org.springframework.data.annotation.Transient;
+
+import cn.ibizlab.util.domain.EntityClient;
+
+/**
+ * ServiceApi [历史] 对象
+ */
+@Data
+public class WFHistory extends EntityClient implements Serializable {
+
+    /**
+     * 标识
+     */
+    @DEField(name = "histid" , isKeyField=true)
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    private String id;
+
+    /**
+     * 操作者标识
+     */
+    @JSONField(name = "author")
+    @JsonProperty("author")
+    private String author;
+
+    /**
+     * 操作者
+     */
+    @JSONField(name = "authorName")
+    @JsonProperty("authorName")
+    private String authorname;
+
+    /**
+     * 意见
+     */
+    @JSONField(name = "message")
+    @JsonProperty("message")
+    private String message;
+
+    /**
+     * 时间
+     */
+    @DEField(name = "actiontime")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "time" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("time")
+    private Timestamp time;
+
+    /**
+     * 任务标识
+     */
+    @JSONField(name = "taskId")
+    @JsonProperty("taskId")
+    private String taskid;
+
+    /**
+     * 实例标识
+     */
+    @DEField(name = "instanceid")
+    @JSONField(name = "processInstanceId")
+    @JsonProperty("processInstanceId")
+    private String processinstanceid;
+
+    /**
+     * 业务键值
+     */
+    @DEField(name = "businesskey")
+    @JSONField(name = "processInstanceBusinessKey")
+    @JsonProperty("processInstanceBusinessKey")
+    private String processinstancebusinesskey;
+
+
+
+
+
+    /**
+     * 设置 [操作者标识]
+     */
+    public void setAuthor(String author){
+        this.author = author ;
+        this.modify("author",author);
+    }
+    /**
+     * 设置 [操作者]
+     */
+    public void setAuthorname(String authorname){
+        this.authorname = authorname ;
+        this.modify("authorname",authorname);
+    }
+    /**
+     * 设置 [意见]
+     */
+    public void setMessage(String message){
+        this.message = message ;
+        this.modify("message",message);
+    }
+    /**
+     * 设置 [时间]
+     */
+    public void setTime(Timestamp time){
+        this.time = time ;
+        this.modify("actiontime",time);
+    }
+    /**
+     * 设置 [任务标识]
+     */
+    public void setTaskid(String taskid){
+        this.taskid = taskid ;
+        this.modify("taskid",taskid);
+    }
+    /**
+     * 设置 [实例标识]
+     */
+    public void setProcessinstanceid(String processinstanceid){
+        this.processinstanceid = processinstanceid ;
+        this.modify("instanceid",processinstanceid);
+    }
+    /**
+     * 设置 [业务键值]
+     */
+    public void setProcessinstancebusinesskey(String processinstancebusinesskey){
+        this.processinstancebusinesskey = processinstancebusinesskey ;
+        this.modify("businesskey",processinstancebusinesskey);
+    }
+
+}
+
+

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java

@@ -71,6 +71,14 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
     @JSONField(name = "pssystemid")
     @JsonProperty("pssystemid")
     private String pssystemid;
+    /**
+     * TaskDefinitionKey
+     */
+    @DEField(name = "taskdefinitionkey")
+    @TableField(value = "taskdefinitionkey")
+    @JSONField(name = "taskprocessdefinitionkey")
+    @JsonProperty("taskprocessdefinitionkey")
+    private String taskprocessdefinitionkey;
     /**
      * 校验
      */
@@ -123,6 +131,13 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.pssystemid = pssystemid ;
         this.modify("pssystemid",pssystemid);
     }
+    /**
+     * 设置 [TaskDefinitionKey]
+     */
+    public void setTaskprocessdefinitionkey(String taskprocessdefinitionkey){
+        this.taskprocessdefinitionkey = taskprocessdefinitionkey ;
+        this.modify("taskdefinitionkey",taskprocessdefinitionkey);
+    }
     /**
      * 设置 [校验]
      */

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTaskWay.java

@@ -37,6 +37,14 @@ public class WFTaskWay extends EntityClient implements Serializable {
     @JsonProperty("sequenceFlowId")
     private String sequenceflowid;
 
+    /**
+     * 路径标识
+     */
+    @DEField(name = "wayname")
+    @JSONField(name = "sequenceFlowName")
+    @JsonProperty("sequenceFlowName")
+    private String sequenceflowname;
+
     /**
      * 任务标识
      */
@@ -83,18 +91,17 @@ public class WFTaskWay extends EntityClient implements Serializable {
     @JsonProperty("refViewKey")
     private String refviewkey;
 
-    /**
-     * 路径标识
-     */
-    @DEField(name = "wayname")
-    @JSONField(name = "sequenceFlowName")
-    @JsonProperty("sequenceFlowName")
-    private String sequenceflowname;
-
 
 
 
 
+    /**
+     * 设置 [路径标识]
+     */
+    public void setSequenceflowname(String sequenceflowname){
+        this.sequenceflowname = sequenceflowname ;
+        this.modify("wayname",sequenceflowname);
+    }
     /**
      * 设置 [任务标识]
      */
@@ -137,13 +144,6 @@ public class WFTaskWay extends EntityClient implements Serializable {
         this.refviewkey = refviewkey ;
         this.modify("refviewkey",refviewkey);
     }
-    /**
-     * 设置 [路径标识]
-     */
-    public void setSequenceflowname(String sequenceflowname){
-        this.sequenceflowname = sequenceflowname ;
-        this.modify("wayname",sequenceflowname);
-    }
 
 }
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFHistorySearchContext.java

+package cn.ibizlab.core.workflow.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.util.filter.SearchContextBase;
+
+/**
+ * ServiceApi数据实体[WFHistory] 查询条件对象
+ */
+@Slf4j
+@Data
+public class WFHistorySearchContext extends SearchContextBase {
+	private String n_authorname_like;//[操作者]
+
+}
+
+
+

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFGroupMapper.java

@@ -27,6 +27,8 @@ public interface WFGroupMapper extends BaseMapper<WFGroup>{
     @Override
     int updateById(@Param(Constants.ENTITY) WFGroup entity);
     @Override
+    int update(@Param(Constants.ENTITY) WFGroup entity, @Param("ew") Wrapper<WFGroup> updateWrapper);
+    @Override
     int deleteById(Serializable id);
      /**
       * 自定义查询SQL

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFMemberMapper.java

@@ -27,6 +27,8 @@ public interface WFMemberMapper extends BaseMapper<WFMember>{
     @Override
     int updateById(@Param(Constants.ENTITY) WFMember entity);
     @Override
+    int update(@Param(Constants.ENTITY) WFMember entity, @Param("ew") Wrapper<WFMember> updateWrapper);
+    @Override
     int deleteById(Serializable id);
      /**
       * 自定义查询SQL

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFProcessDefinitionMapper.java

@@ -27,6 +27,8 @@ public interface WFProcessDefinitionMapper extends BaseMapper<WFProcessDefinitio
     @Override
     int updateById(@Param(Constants.ENTITY) WFProcessDefinition entity);
     @Override
+    int update(@Param(Constants.ENTITY) WFProcessDefinition entity, @Param("ew") Wrapper<WFProcessDefinition> updateWrapper);
+    @Override
     int deleteById(Serializable id);
      /**
       * 自定义查询SQL

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFSystemMapper.java

@@ -27,6 +27,8 @@ public interface WFSystemMapper extends BaseMapper<WFSystem>{
     @Override
     int updateById(@Param(Constants.ENTITY) WFSystem entity);
     @Override
+    int update(@Param(Constants.ENTITY) WFSystem entity, @Param("ew") Wrapper<WFSystem> updateWrapper);
+    @Override
     int deleteById(Serializable id);
      /**
       * 自定义查询SQL

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFUserMapper.java

@@ -27,6 +27,8 @@ public interface WFUserMapper extends BaseMapper<WFUser>{
     @Override
     int updateById(@Param(Constants.ENTITY) WFUser entity);
     @Override
+    int update(@Param(Constants.ENTITY) WFUser entity, @Param("ew") Wrapper<WFUser> updateWrapper);
+    @Override
     int deleteById(Serializable id);
      /**
       * 自定义查询SQL

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFGroupService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFGroup;
 import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFHistoryService.java

+package cn.ibizlab.core.workflow.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.core.workflow.domain.WFHistory;
+import cn.ibizlab.core.workflow.filter.WFHistorySearchContext;
+
+
+/**
+ * 实体[WFHistory] 服务对象接口
+ */
+public interface IWFHistoryService{
+
+    boolean checkKey(WFHistory et) ;
+    boolean update(WFHistory et) ;
+    void updateBatch(List<WFHistory> list) ;
+    boolean save(WFHistory et) ;
+    void saveBatch(List<WFHistory> list) ;
+    boolean create(WFHistory et) ;
+    void createBatch(List<WFHistory> list) ;
+    WFHistory get(String key) ;
+    boolean remove(String key) ;
+    void removeBatch(Collection<String> idList) ;
+    WFHistory getDraft(WFHistory et) ;
+    Page<WFHistory> searchDefault(WFHistorySearchContext context) ;
+
+}
+
+
+

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFMemberService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFMember;
 import cn.ibizlab.core.workflow.filter.WFMemberSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFProcessDefinitionService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFProcessDefinition;
 import cn.ibizlab.core.workflow.filter.WFProcessDefinitionSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFProcessInstanceService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFProcessInstance;
 import cn.ibizlab.core.workflow.filter.WFProcessInstanceSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFProcessNodeService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFProcessNode;
 import cn.ibizlab.core.workflow.filter.WFProcessNodeSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFREModelService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFREModel;
 import cn.ibizlab.core.workflow.filter.WFREModelSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFSystemService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFSystem;
 import cn.ibizlab.core.workflow.filter.WFSystemSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFTaskService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFTask;
 import cn.ibizlab.core.workflow.filter.WFTaskSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFTaskWayService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFTaskWay;
 import cn.ibizlab.core.workflow.filter.WFTaskWaySearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFUserService.java

@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
 
 import cn.ibizlab.core.workflow.domain.WFUser;
 import cn.ibizlab.core.workflow.filter.WFUserSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFHistoryServiceImpl.java

+package cn.ibizlab.core.workflow.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.core.workflow.domain.WFHistory;
+import cn.ibizlab.core.workflow.filter.WFHistorySearchContext;
+import cn.ibizlab.core.workflow.service.IWFHistoryService;
+
+import cn.ibizlab.util.helper.CachedBeanCopier;
+
+
+/**
+ * 实体[历史] 无存储服务对象接口实现
+ */
+@Slf4j
+@Service
+public class WFHistoryServiceImpl implements IWFHistoryService {
+
+
+    @Override
+    public boolean checkKey(WFHistory et) {
+        return false;
+    }
+    @Override
+    public boolean update(WFHistory et) {
+        //代码实现
+        return true;
+    }
+
+    public void updateBatch(List<WFHistory> list){
+                    
+    }
+
+    @Override
+    @Transactional
+    public boolean save(WFHistory et) {
+        //代码实现
+        return true;
+    }
+
+    @Override
+    public void saveBatch(List<WFHistory> list) {
+                       
+    }
+
+    @Override
+    public boolean create(WFHistory et) {
+        //代码实现
+        return true;
+    }
+
+    public void createBatch(List<WFHistory> list){
+
+    }
+
+    @Override
+    public WFHistory get(String key) {
+        WFHistory et = new WFHistory();
+        et.setId(key);
+        return et;
+    }
+
+    @Override
+    public boolean remove(String key) {
+        return true;
+    }
+
+    public void removeBatch(Collection<String> idList){
+                        
+    }
+
+    @Override
+    public WFHistory getDraft(WFHistory et) {
+        return et;
+    }
+
+
+
+
+
+    /**
+     * 查询集合 DEFAULT
+     */
+    @Override
+    public Page<WFHistory> searchDefault(WFHistorySearchContext context) {
+        return new PageImpl<WFHistory>(new ArrayList(),context.getPageable(),0);
+    }
+
+
+}
+

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

@@ -81,12 +81,36 @@
                 </column>
         </createTable>
     </changeSet>
+    <!--输出实体[WF_HISTORY]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_history-17-7">
+        <createTable tableName="IBZWFHISTORY">
+                <column name="HISTID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_HISTORY_HISTID"/>
+                </column>
+                <column name="AUTHOR" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="AUTHORNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MESSAGE" remarks="" type="VARCHAR(2000)">
+                </column>
+                <column name="ACTIONTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="TASKID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="INSTANCEID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BUSINESSKEY" remarks="" type="VARCHAR(100)">
+                </column>
+        </createTable>
+    </changeSet>
     <!--输出实体[WF_TASK_WAY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_task_way-23-7">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_task_way-24-8">
         <createTable tableName="IBZWFTASKWAY">
                 <column name="WAYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_TASK_WAY_WAYID"/>
                 </column>
+                <column name="WAYNAME" remarks="" type="VARCHAR(100)">
+                </column>
                 <column name="TASKID" remarks="" type="VARCHAR(100)">
                 </column>
                 <column name="TASKDEFINITIONKEY" remarks="" type="VARCHAR(100)">
@@ -99,12 +123,10 @@
                 </column>
                 <column name="REFVIEWKEY" remarks="" type="VARCHAR(100)">
                 </column>
-                <column name="WAYNAME" remarks="" type="VARCHAR(100)">
-                </column>
         </createTable>
     </changeSet>
     <!--输出实体[WF_DEFINITION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_definition-50-8">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_definition-51-9">
         <createTable tableName="IBZWFDEFINITION">
                 <column name="DEFINITIONKEY" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_DEFINITION_DEFINITIONKEY"/>
@@ -117,6 +139,8 @@
                 </column>
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="TASKDEFINITIONKEY" remarks="" type="VARCHAR(100)">
+                </column>
                 <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
                 </column>
                 <column name="BPMNFILE" remarks="" type="VARCHAR(1000)">
@@ -126,7 +150,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-39-9">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-39-10">
         <createTable tableName="IBZWFMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
@@ -140,7 +164,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[WF_TASK]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_task-17-10">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_task-17-11">
         <createTable tableName="IBZTASK">
                 <column name="TASKID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_TASK_TASKID"/>
@@ -164,13 +188,14 @@
         <!--输出实体[WF_GROUP]外键关系 -->
         <!--输出实体[WF_INSTANCE]外键关系 -->
         <!--输出实体[WF_MODEL]外键关系 -->
+        <!--输出实体[WF_HISTORY]外键关系 -->
         <!--输出实体[WF_TASK_WAY]外键关系 -->
         <!--输出实体[WF_DEFINITION]外键关系 -->
         <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-39-11">
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-39-12">
        <addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-39-12">
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-39-13">
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_USER_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZUSER" validate="true"/>
     </changeSet>
         <!--输出实体[WF_TASK]外键关系 -->

ibzwf-core/src/main/resources/mapper/workflow/wfprocessdefinition/WFProcessDefinitionMapper.xml

@@ -5,12 +5,13 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="WFProcessDefinitionResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1  ) t1 where definitionkey=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID`, t1.`TASKDEFINITIONKEY` FROM `IBZWFDEFINITION` t1  ) t1 where definitionkey=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="WFProcessDefinitionResultMap" type="cn.ibizlab.core.workflow.domain.WFProcessDefinition" autoMapping="true">
         <id property="definitionkey" column="definitionkey" /><!--主键字段映射-->
+		<result property="taskprocessdefinitionkey" column="taskdefinitionkey" />
             
 		
     </resultMap>
@@ -27,13 +28,13 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1  
+       <![CDATA[	SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID`, t1.`TASKDEFINITIONKEY` FROM `IBZWFDEFINITION` t1  
 			]]>
     </sql>
 
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1  
+       <![CDATA[	SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID`, t1.`TASKDEFINITIONKEY` FROM `IBZWFDEFINITION` t1  
 			]]>
     </sql>
 

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessDefinitionDTO.java

@@ -63,6 +63,14 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
     @JsonProperty("pssystemid")
     private String pssystemid;
 
+    /**
+     * 属性 [TASKDEFINITIONKEY]
+     *
+     */
+    @JSONField(name = "taskprocessdefinitionkey")
+    @JsonProperty("taskprocessdefinitionkey")
+    private String taskprocessdefinitionkey;
+
     /**
      * 属性 [MD5CHECK]
      *
@@ -120,6 +128,14 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
         this.modify("pssystemid",pssystemid);
     }
 
+    /**
+     * 设置 [TASKDEFINITIONKEY]
+     */
+    public void setTaskprocessdefinitionkey(String  taskprocessdefinitionkey){
+        this.taskprocessdefinitionkey = taskprocessdefinitionkey ;
+        this.modify("taskdefinitionkey",taskprocessdefinitionkey);
+    }
+
     /**
      * 设置 [MD5CHECK]
      */

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java

@@ -50,11 +50,14 @@ public class WFGroupResource {
 
     @Autowired
     @Lazy
-    private WFGroupMapping wfgroupMapping;
+    public WFGroupMapping wfgroupMapping;
 
+    public WFGroupDTO permissionDTO=new WFGroupDTO();
 
 
 
+
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Save-all')")
     @ApiOperation(value = "Save", tags = {"WFGroup" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/save")
     public ResponseEntity<Boolean> save(@RequestBody WFGroupDTO wfgroupdto) {
@@ -71,7 +74,7 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Update-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Update-all')")
     @ApiOperation(value = "Update", tags = {"WFGroup" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}")
     @Transactional
@@ -83,7 +86,6 @@ public class WFGroupResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Update-all')")
     @ApiOperation(value = "UpdateBatch", tags = {"WFGroup" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
@@ -94,6 +96,7 @@ public class WFGroupResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"WFGroup" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/getdraft")
     public ResponseEntity<WFGroupDTO> getDraft() {
@@ -103,6 +106,7 @@ public class WFGroupResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"WFGroup" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WFGroupDTO wfgroupdto) {
@@ -112,7 +116,7 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Create-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Create-all')")
     @ApiOperation(value = "Create", tags = {"WFGroup" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups")
     @Transactional
@@ -122,7 +126,7 @@ public class WFGroupResource {
         WFGroupDTO dto = wfgroupMapping.toDto(domain);
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Create-all')")
+
     @ApiOperation(value = "createBatch", tags = {"WFGroup" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
@@ -133,7 +137,7 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Remove-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"WFGroup" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}")
     @Transactional
@@ -151,7 +155,7 @@ public class WFGroupResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Get-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Get-all')")
     @ApiOperation(value = "Get", tags = {"WFGroup" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}")
     public ResponseEntity<WFGroupDTO> get(@PathVariable("wfgroup_id") String wfgroup_id) {
@@ -160,7 +164,7 @@ public class WFGroupResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFGroup" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfgroups/fetchdefault")
 	public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) {
@@ -173,7 +177,7 @@ public class WFGroupResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFGroup-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFGroup" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfgroups/searchdefault")
 	public ResponseEntity<Page<WFGroupDTO>> searchDefault(@RequestBody WFGroupSearchContext context) {
@@ -183,12 +187,6 @@ public class WFGroupResource {
 	}
 
 
-    /**
-     * 用户权限校验
-     * @return
-     */
-	public WFGroup getEntity(){
-        return new WFGroup();
-    }
-
 }
+
+

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFMemberResource.java

@@ -50,11 +50,14 @@ public class WFMemberResource {
 
     @Autowired
     @Lazy
-    private WFMemberMapping wfmemberMapping;
+    public WFMemberMapping wfmemberMapping;
 
+    public WFMemberDTO permissionDTO=new WFMemberDTO();
 
 
 
+
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"WFMember" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WFMemberDTO wfmemberdto) {
@@ -64,6 +67,7 @@ public class WFMemberResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"WFMember" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfmembers/getdraft")
     public ResponseEntity<WFMemberDTO> getDraft() {
@@ -73,7 +77,7 @@ public class WFMemberResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Create-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Create-all')")
     @ApiOperation(value = "Create", tags = {"WFMember" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfmembers")
     @Transactional
@@ -83,7 +87,7 @@ public class WFMemberResource {
         WFMemberDTO dto = wfmemberMapping.toDto(domain);
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Create-all')")
+
     @ApiOperation(value = "createBatch", tags = {"WFMember" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
@@ -94,7 +98,7 @@ public class WFMemberResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Remove-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"WFMember" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/{wfmember_id}")
     @Transactional
@@ -112,6 +116,7 @@ public class WFMemberResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Save-all')")
     @ApiOperation(value = "Save", tags = {"WFMember" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/save")
     public ResponseEntity<Boolean> save(@RequestBody WFMemberDTO wfmemberdto) {
@@ -128,7 +133,7 @@ public class WFMemberResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Update-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Update-all')")
     @ApiOperation(value = "Update", tags = {"WFMember" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/{wfmember_id}")
     @Transactional
@@ -140,7 +145,6 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Update-all')")
     @ApiOperation(value = "UpdateBatch", tags = {"WFMember" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
@@ -151,7 +155,7 @@ public class WFMemberResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Get-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Get-all')")
     @ApiOperation(value = "Get", tags = {"WFMember" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfmembers/{wfmember_id}")
     public ResponseEntity<WFMemberDTO> get(@PathVariable("wfmember_id") String wfmember_id) {
@@ -160,7 +164,7 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFMember" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfmembers/fetchdefault")
 	public ResponseEntity<List<WFMemberDTO>> fetchDefault(WFMemberSearchContext context) {
@@ -173,7 +177,7 @@ public class WFMemberResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFMember" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfmembers/searchdefault")
 	public ResponseEntity<Page<WFMemberDTO>> searchDefault(@RequestBody WFMemberSearchContext context) {
@@ -184,12 +188,14 @@ public class WFMemberResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-CheckKey-all')")
     @ApiOperation(value = "CheckKeyByWFGroup", tags = {"WFMember" },  notes = "CheckKeyByWFGroup")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/checkkey")
     public ResponseEntity<Boolean> checkKeyByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-GetDraft-all')")
     @ApiOperation(value = "GetDraftByWFGroup", tags = {"WFMember" },  notes = "GetDraftByWFGroup")
     @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}/wfmembers/getdraft")
     public ResponseEntity<WFMemberDTO> getDraftByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id) {
@@ -198,6 +204,7 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain)));
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Create-all')")
     @ApiOperation(value = "CreateByWFGroup", tags = {"WFMember" },  notes = "CreateByWFGroup")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers")
     @Transactional
@@ -220,6 +227,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Remove-all')")
     @ApiOperation(value = "RemoveByWFGroup", tags = {"WFMember" },  notes = "RemoveByWFGroup")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}")
     @Transactional
@@ -234,6 +242,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Save-all')")
     @ApiOperation(value = "SaveByWFGroup", tags = {"WFMember" },  notes = "SaveByWFGroup")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/save")
     public ResponseEntity<Boolean> saveByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) {
@@ -253,6 +262,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Update-all')")
     @ApiOperation(value = "UpdateByWFGroup", tags = {"WFMember" },  notes = "UpdateByWFGroup")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}")
     @Transactional
@@ -276,6 +286,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Get-all')")
     @ApiOperation(value = "GetByWFGroup", tags = {"WFMember" },  notes = "GetByWFGroup")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}")
     public ResponseEntity<WFMemberDTO> getByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id) {
@@ -284,6 +295,7 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
 	@ApiOperation(value = "fetchDEFAULTByWFGroup", tags = {"WFMember" } ,notes = "fetchDEFAULTByWFGroup")
     @RequestMapping(method= RequestMethod.GET , value="/wfgroups/{wfgroup_id}/wfmembers/fetchdefault")
 	public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id,WFMemberSearchContext context) {
@@ -297,6 +309,7 @@ public class WFMemberResource {
                 .body(list);
 	}
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
 	@ApiOperation(value = "searchDEFAULTByWFGroup", tags = {"WFMember" } ,notes = "searchDEFAULTByWFGroup")
     @RequestMapping(method= RequestMethod.POST , value="/wfgroups/{wfgroup_id}/wfmembers/searchdefault")
 	public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberSearchContext context) {
@@ -308,12 +321,14 @@ public class WFMemberResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-CheckKey-all')")
     @ApiOperation(value = "CheckKeyByWFUser", tags = {"WFMember" },  notes = "CheckKeyByWFUser")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/checkkey")
     public ResponseEntity<Boolean> checkKeyByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-GetDraft-all')")
     @ApiOperation(value = "GetDraftByWFUser", tags = {"WFMember" },  notes = "GetDraftByWFUser")
     @RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}/wfmembers/getdraft")
     public ResponseEntity<WFMemberDTO> getDraftByWFUser(@PathVariable("wfuser_id") String wfuser_id) {
@@ -322,6 +337,7 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain)));
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Create-all')")
     @ApiOperation(value = "CreateByWFUser", tags = {"WFMember" },  notes = "CreateByWFUser")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers")
     @Transactional
@@ -344,6 +360,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Remove-all')")
     @ApiOperation(value = "RemoveByWFUser", tags = {"WFMember" },  notes = "RemoveByWFUser")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
     @Transactional
@@ -358,6 +375,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Save-all')")
     @ApiOperation(value = "SaveByWFUser", tags = {"WFMember" },  notes = "SaveByWFUser")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/save")
     public ResponseEntity<Boolean> saveByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
@@ -377,6 +395,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Update-all')")
     @ApiOperation(value = "UpdateByWFUser", tags = {"WFMember" },  notes = "UpdateByWFUser")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
     @Transactional
@@ -400,6 +419,7 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Get-all')")
     @ApiOperation(value = "GetByWFUser", tags = {"WFMember" },  notes = "GetByWFUser")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
     public ResponseEntity<WFMemberDTO> getByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id) {
@@ -408,6 +428,7 @@ public class WFMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
 	@ApiOperation(value = "fetchDEFAULTByWFUser", tags = {"WFMember" } ,notes = "fetchDEFAULTByWFUser")
     @RequestMapping(method= RequestMethod.GET , value="/wfusers/{wfuser_id}/wfmembers/fetchdefault")
 	public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id,WFMemberSearchContext context) {
@@ -421,6 +442,7 @@ public class WFMemberResource {
                 .body(list);
 	}
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-Default-all')")
 	@ApiOperation(value = "searchDEFAULTByWFUser", tags = {"WFMember" } ,notes = "searchDEFAULTByWFUser")
     @RequestMapping(method= RequestMethod.POST , value="/wfusers/{wfuser_id}/wfmembers/searchdefault")
 	public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberSearchContext context) {
@@ -431,12 +453,6 @@ public class WFMemberResource {
 	}
 
 
-    /**
-     * 用户权限校验
-     * @return
-     */
-	public WFMember getEntity(){
-        return new WFMember();
-    }
-
 }
+
+

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFProcessDefinitionResource.java

@@ -50,11 +50,14 @@ public class WFProcessDefinitionResource {
 
     @Autowired
     @Lazy
-    private WFProcessDefinitionMapping wfprocessdefinitionMapping;
+    public WFProcessDefinitionMapping wfprocessdefinitionMapping;
 
+    public WFProcessDefinitionDTO permissionDTO=new WFProcessDefinitionDTO();
 
 
 
+
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Save-all')")
     @ApiOperation(value = "Save", tags = {"WFProcessDefinition" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/save")
     public ResponseEntity<Boolean> save(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
@@ -71,7 +74,7 @@ public class WFProcessDefinitionResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Update-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Update-all')")
     @ApiOperation(value = "Update", tags = {"WFProcessDefinition" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
     @Transactional
@@ -83,7 +86,6 @@ public class WFProcessDefinitionResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Update-all')")
     @ApiOperation(value = "UpdateBatch", tags = {"WFProcessDefinition" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
@@ -94,7 +96,7 @@ public class WFProcessDefinitionResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Get-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Get-all')")
     @ApiOperation(value = "Get", tags = {"WFProcessDefinition" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
     public ResponseEntity<WFProcessDefinitionDTO> get(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) {
@@ -106,6 +108,7 @@ public class WFProcessDefinitionResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"WFProcessDefinition" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
@@ -115,6 +118,7 @@ public class WFProcessDefinitionResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"WFProcessDefinition" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/getdraft")
     public ResponseEntity<WFProcessDefinitionDTO> getDraft() {
@@ -124,7 +128,7 @@ public class WFProcessDefinitionResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Create-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Create-all')")
     @ApiOperation(value = "Create", tags = {"WFProcessDefinition" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions")
     @Transactional
@@ -134,7 +138,7 @@ public class WFProcessDefinitionResource {
         WFProcessDefinitionDTO dto = wfprocessdefinitionMapping.toDto(domain);
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Create-all')")
+
     @ApiOperation(value = "createBatch", tags = {"WFProcessDefinition" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
@@ -145,7 +149,7 @@ public class WFProcessDefinitionResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Remove-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"WFProcessDefinition" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
     @Transactional
@@ -160,7 +164,7 @@ public class WFProcessDefinitionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfprocessdefinitions/fetchdefault")
 	public ResponseEntity<List<WFProcessDefinitionDTO>> fetchDefault(WFProcessDefinitionSearchContext context) {
@@ -173,7 +177,7 @@ public class WFProcessDefinitionResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFProcessDefinition-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfprocessdefinitions/searchdefault")
 	public ResponseEntity<Page<WFProcessDefinitionDTO>> searchDefault(@RequestBody WFProcessDefinitionSearchContext context) {
@@ -183,12 +187,6 @@ public class WFProcessDefinitionResource {
 	}
 
 
-    /**
-     * 用户权限校验
-     * @return
-     */
-	public WFProcessDefinition getEntity(){
-        return new WFProcessDefinition();
-    }
-
 }
+
+

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFREModelResource.java

@@ -50,12 +50,14 @@ public class WFREModelResource {
 
     @Autowired
     @Lazy
-    private WFREModelMapping wfremodelMapping;
+    public WFREModelMapping wfremodelMapping;
 
+    public WFREModelDTO permissionDTO=new WFREModelDTO();
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Update-all')")
+
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Update-all')")
     @ApiOperation(value = "Update", tags = {"WFREModel" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/{wfremodel_id}")
     @Transactional
@@ -67,7 +69,6 @@ public class WFREModelResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Update-all')")
     @ApiOperation(value = "UpdateBatch", tags = {"WFREModel" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
@@ -78,6 +79,7 @@ public class WFREModelResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Save-all')")
     @ApiOperation(value = "Save", tags = {"WFREModel" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/save")
     public ResponseEntity<Boolean> save(@RequestBody WFREModelDTO wfremodeldto) {
@@ -94,7 +96,7 @@ public class WFREModelResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Get-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Get-all')")
     @ApiOperation(value = "Get", tags = {"WFREModel" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfremodels/{wfremodel_id}")
     public ResponseEntity<WFREModelDTO> get(@PathVariable("wfremodel_id") String wfremodel_id) {
@@ -106,7 +108,7 @@ public class WFREModelResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Create-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Create-all')")
     @ApiOperation(value = "Create", tags = {"WFREModel" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfremodels")
     @Transactional
@@ -116,7 +118,7 @@ public class WFREModelResource {
         WFREModelDTO dto = wfremodelMapping.toDto(domain);
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Create-all')")
+
     @ApiOperation(value = "createBatch", tags = {"WFREModel" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
@@ -127,6 +129,7 @@ public class WFREModelResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"WFREModel" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WFREModelDTO wfremodeldto) {
@@ -136,7 +139,7 @@ public class WFREModelResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Remove-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"WFREModel" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/{wfremodel_id}")
     @Transactional
@@ -154,13 +157,14 @@ public class WFREModelResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"WFREModel" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfremodels/getdraft")
     public ResponseEntity<WFREModelDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(wfremodelMapping.toDto(wfremodelService.getDraft(new WFREModel())));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFREModel" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfremodels/fetchdefault")
 	public ResponseEntity<List<WFREModelDTO>> fetchDefault(WFREModelSearchContext context) {
@@ -173,7 +177,7 @@ public class WFREModelResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFREModel-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFREModel" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfremodels/searchdefault")
 	public ResponseEntity<Page<WFREModelDTO>> searchDefault(@RequestBody WFREModelSearchContext context) {
@@ -183,12 +187,6 @@ public class WFREModelResource {
 	}
 
 
-    /**
-     * 用户权限校验
-     * @return
-     */
-	public WFREModel getEntity(){
-        return new WFREModel();
-    }
-
 }
+
+

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFSystemResource.java

@@ -50,12 +50,14 @@ public class WFSystemResource {
 
     @Autowired
     @Lazy
-    private WFSystemMapping wfsystemMapping;
+    public WFSystemMapping wfsystemMapping;
 
+    public WFSystemDTO permissionDTO=new WFSystemDTO();
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Remove-all')")
+
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"WFSystem" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/{wfsystem_id}")
     @Transactional
@@ -73,7 +75,7 @@ public class WFSystemResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Update-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Update-all')")
     @ApiOperation(value = "Update", tags = {"WFSystem" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/{wfsystem_id}")
     @Transactional
@@ -85,7 +87,6 @@ public class WFSystemResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Update-all')")
     @ApiOperation(value = "UpdateBatch", tags = {"WFSystem" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
@@ -96,6 +97,7 @@ public class WFSystemResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"WFSystem" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfsystems/getdraft")
     public ResponseEntity<WFSystemDTO> getDraft() {
@@ -105,6 +107,7 @@ public class WFSystemResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Save-all')")
     @ApiOperation(value = "Save", tags = {"WFSystem" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/save")
     public ResponseEntity<Boolean> save(@RequestBody WFSystemDTO wfsystemdto) {
@@ -121,7 +124,7 @@ public class WFSystemResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Create-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Create-all')")
     @ApiOperation(value = "Create", tags = {"WFSystem" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfsystems")
     @Transactional
@@ -131,7 +134,7 @@ public class WFSystemResource {
         WFSystemDTO dto = wfsystemMapping.toDto(domain);
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Create-all')")
+
     @ApiOperation(value = "createBatch", tags = {"WFSystem" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
@@ -142,6 +145,7 @@ public class WFSystemResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"WFSystem" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WFSystemDTO wfsystemdto) {
@@ -151,7 +155,7 @@ public class WFSystemResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Get-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Get-all')")
     @ApiOperation(value = "Get", tags = {"WFSystem" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfsystems/{wfsystem_id}")
     public ResponseEntity<WFSystemDTO> get(@PathVariable("wfsystem_id") String wfsystem_id) {
@@ -160,7 +164,7 @@ public class WFSystemResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFSystem" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfsystems/fetchdefault")
 	public ResponseEntity<List<WFSystemDTO>> fetchDefault(WFSystemSearchContext context) {
@@ -173,7 +177,7 @@ public class WFSystemResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFSystem-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFSystem" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfsystems/searchdefault")
 	public ResponseEntity<Page<WFSystemDTO>> searchDefault(@RequestBody WFSystemSearchContext context) {
@@ -183,12 +187,6 @@ public class WFSystemResource {
 	}
 
 
-    /**
-     * 用户权限校验
-     * @return
-     */
-	public WFSystem getEntity(){
-        return new WFSystem();
-    }
-
 }
+
+

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java

@@ -50,12 +50,14 @@ public class WFUserResource {
 
     @Autowired
     @Lazy
-    private WFUserMapping wfuserMapping;
+    public WFUserMapping wfuserMapping;
 
+    public WFUserDTO permissionDTO=new WFUserDTO();
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Remove-all')")
+
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Remove-all')")
     @ApiOperation(value = "Remove", tags = {"WFUser" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}")
     @Transactional
@@ -73,6 +75,7 @@ public class WFUserResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-GetDraft-all')")
     @ApiOperation(value = "GetDraft", tags = {"WFUser" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfusers/getdraft")
     public ResponseEntity<WFUserDTO> getDraft() {
@@ -82,6 +85,7 @@ public class WFUserResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Save-all')")
     @ApiOperation(value = "Save", tags = {"WFUser" },  notes = "Save")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/save")
     public ResponseEntity<Boolean> save(@RequestBody WFUserDTO wfuserdto) {
@@ -98,7 +102,7 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Update-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Update-all')")
     @ApiOperation(value = "Update", tags = {"WFUser" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}")
     @Transactional
@@ -110,7 +114,6 @@ public class WFUserResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Update-all')")
     @ApiOperation(value = "UpdateBatch", tags = {"WFUser" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
@@ -121,7 +124,7 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Get-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Get-all')")
     @ApiOperation(value = "Get", tags = {"WFUser" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}")
     public ResponseEntity<WFUserDTO> get(@PathVariable("wfuser_id") String wfuser_id) {
@@ -133,7 +136,7 @@ public class WFUserResource {
 
 
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Create-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Create-all')")
     @ApiOperation(value = "Create", tags = {"WFUser" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers")
     @Transactional
@@ -143,7 +146,7 @@ public class WFUserResource {
         WFUserDTO dto = wfuserMapping.toDto(domain);
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Create-all')")
+
     @ApiOperation(value = "createBatch", tags = {"WFUser" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
@@ -154,13 +157,14 @@ public class WFUserResource {
 
 
 
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"WFUser" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody WFUserDTO wfuserdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(wfuserService.checkKey(wfuserMapping.toDomain(wfuserdto)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Default-all')")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"WFUser" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfusers/fetchdefault")
 	public ResponseEntity<List<WFUserDTO>> fetchDefault(WFUserSearchContext context) {
@@ -173,7 +177,7 @@ public class WFUserResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Default-all')")
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFUser-Default-all')")
 	@ApiOperation(value = "searchDEFAULT", tags = {"WFUser" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfusers/searchdefault")
 	public ResponseEntity<Page<WFUserDTO>> searchDefault(@RequestBody WFUserSearchContext context) {
@@ -183,12 +187,6 @@ public class WFUserResource {
 	}
 
 
-    /**
-     * 用户权限校验
-     * @return
-     */
-	public WFUser getEntity(){
-        return new WFUser();
-    }
-
 }
+
+

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mongodb.QueryBuilder;
 import cn.ibizlab.util.annotation.DEField;
+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;
@@ -72,8 +74,10 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
             return true;
 
         List paramList = (ArrayList) params;
-        EntityBase  entity = (EntityBase) paramList.get(0);
-        String deStorageMode= (String) paramList.get(1);
+        String deStorageMode= (String) paramList.get(0);
+        MappingBase mappingBase= (MappingBase) paramList.get(1);
+        DTOBase dtoBase = (DTOBase) paramList.get(2);
+        EntityBase entity = (EntityBase) mappingBase.toDomain(dtoBase);
 
         if (StringUtils.isEmpty(entity))
             return false;
@@ -82,10 +86,6 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         JSONObject permissionList=userPermission.getJSONObject("entities");
         String entityName = entity.getClass().getSimpleName();
 
-        if(action.equalsIgnoreCase("create")){
-            return validDEActionHasPermission(permissionList,entityName,action);
-        }
-        else{
         //拥有全部数据访问权限时，则跳过权限检查
         if(isAllData(permissionList,entityName,action)){
             return true;
@@ -94,8 +94,11 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         if(!validDEActionHasPermission(permissionList,entityName,action)){
             return false;
         }
-            //检查是否有数据权限
-            return deActionPermissionValidRouter(deStorageMode, entity , action , srfKey, permissionList);
+        if(action.equalsIgnoreCase("create")){
+            return createActionPermissionValid(permissionList,entity, action);
+        }
+        else{
+            return otherActionPermissionValidRouter(deStorageMode, entity , action , srfKey, permissionList);
         }
     }
 
@@ -113,7 +116,10 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         if(!permissionList.containsKey(entityName))
             return false;
         JSONObject entity=permissionList.getJSONObject(entityName);
-        if(entity.containsKey(action) && entity.getJSONArray(action).contains("ALL"))
+        if(!entity.containsKey(DEActionType))
+            return false;
+        JSONObject dataRange=entity.getJSONObject(DEActionType);//获取实体行为对应的数据范围
+        if(dataRange.containsKey(action) && dataRange.getJSONArray(action).contains("all"))
             return true;
 
         return false;
@@ -144,6 +150,81 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         return hasPermission;
     }
 
+    /**
+     * 新建行为校验
+     * @param permissionList
+     * @param entity
+     * @param action
+     * @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;
+
+        boolean isCreate=true;
+
+        String orgField=permissionField.get("orgfield");
+        String orgDeptField=permissionField.get("orgsecfield");
+        String createManField=permissionField.get("createmanfield");
+        AuthenticationUser authenticationUser = AuthenticationUser.getAuthenticationUser();
+        Map<String, Set<String>> userInfo = authenticationUser.getOrgInfo();
+        Set<String> orgParent = userInfo.get("parentorg");
+        Set<String> orgChild = userInfo.get("suborg");
+        Set<String> orgDeptParent = userInfo.get("parentdept");
+        Set<String> orgDeptChild = userInfo.get("subdept");
+
+        Object orgFieldValue=entity.get(orgField);
+        Object orgDeptFieldValue=entity.get(orgDeptField);
+        Object crateManFieldValue=entity.get(createManField);
+
+        Set<String> userOrg = new HashSet<>();
+        Set<String> userOrgDept = new HashSet<>();
+
+        for(int a=0;a<dataRangeList.size();a++){
+            String permissionCond=dataRangeList.getString(a);//权限配置条件
+            if(permissionCond.equals("curorg")){   //本单位
+                userOrg.add(authenticationUser.getOrgid());
+            }
+            else if(permissionCond.equals("porg")){//上级单位
+                userOrg.addAll(orgParent);
+            }
+            else if(permissionCond.equals("sorg")){//下级单位
+                userOrg.addAll(orgChild);
+            }
+            else if(permissionCond.equals("curorgdept")){//本部门
+                userOrgDept.add(authenticationUser.getMdeptid());
+            }
+            else if(permissionCond.equals("porgdept")){//上级部门
+                userOrgDept.addAll(orgDeptParent);
+            }
+            else if(permissionCond.equals("sorgdept")){//下级部门
+                userOrgDept.addAll(orgDeptChild);
+            }
+        }
+
+        if(!ObjectUtils.isEmpty(orgFieldValue) && !userOrg.contains(orgFieldValue)){
+            return false;
+        }
+        if(!ObjectUtils.isEmpty(orgDeptFieldValue) && !userOrgDept.contains(orgDeptFieldValue)){
+            return false;
+        }
+        if(!ObjectUtils.isEmpty(crateManFieldValue) && !crateManFieldValue.equals(authenticationUser.getUserid())){
+            return false;
+        }
+
+        return isCreate;
+    }
 
     /**
      * 根据实体存储模式，进行鉴权
@@ -154,7 +235,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
      * @param permissionList
      * @return
      */
-    private boolean deActionPermissionValidRouter(String deStorageMode, EntityBase entity , String action , Object srfKey , JSONObject permissionList){
+    private boolean otherActionPermissionValidRouter(String deStorageMode, EntityBase entity , String action , Object srfKey , JSONObject permissionList){
 
         if(deStorageMode.equalsIgnoreCase("sql")){
             return sqlPermissionValid(entity , action , srfKey, permissionList);