ibizdev提交

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

@@ -1204,7 +1204,7 @@ export default class WFGroupEditViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1230,7 +1230,7 @@ export default class WFGroupEditViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

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

@@ -1153,7 +1153,7 @@ export default class WFGroupGridViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1231,7 +1231,7 @@ export default class WFGroupGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

app_web/src/pages/workflow/wfindex-view/router.ts

@@ -86,6 +86,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'),
                 },
+                {
+                    path: 'wfusers/:wfuser?/wfmembers/:wfmember?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.wfmember.views.editview.caption',
+                        parameters: [
+                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
+                            { pathName: 'wfusers', parameterName: 'wfuser' },
+                            { pathName: 'wfmembers', parameterName: 'wfmember' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'),
+                },
                 {
                     path: 'wfgroups/:wfgroup?/wfmembers/:wfmember?/editview/:editview?',
                     meta: {
@@ -152,6 +166,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
                 },
+                {
+                    path: 'wfusers/:wfuser?/wfmembers/:wfmember?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.wfmember.views.gridview.caption',
+                        parameters: [
+                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
+                            { pathName: 'wfusers', parameterName: 'wfuser' },
+                            { pathName: 'wfmembers', parameterName: 'wfmember' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'),
+                },
                 {
                     path: 'wfgroups/:wfgroup?/wfmembers/:wfmember?/gridview/:gridview?',
                     meta: {
@@ -208,6 +236,19 @@ const router = new Router({
             ...indexRoutes,
             ],
         },
+    {
+        path: '/wfusers/:wfuser?/wfmembers/:wfmember?/gridview/:gridview?',
+        meta: {
+            caption: 'entities.wfmember.views.gridview.caption',
+            parameters: [
+                { pathName: 'wfusers', parameterName: 'wfuser' },
+                { pathName: 'wfmembers', parameterName: 'wfmember' },
+                { pathName: 'gridview', parameterName: 'gridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'),
+    },
     {
         path: '/wfgroups/:wfgroup?/wfmembers/:wfmember?/gridview/:gridview?',
         meta: {
@@ -305,6 +346,19 @@ const router = new Router({
         },
         component: () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'),
     },
+    {
+        path: '/wfusers/:wfuser?/wfmembers/:wfmember?/editview/:editview?',
+        meta: {
+            caption: 'entities.wfmember.views.editview.caption',
+            parameters: [
+                { pathName: 'wfusers', parameterName: 'wfuser' },
+                { pathName: 'wfmembers', parameterName: 'wfmember' },
+                { pathName: 'editview', parameterName: 'editview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'),
+    },
     {
         path: '/wfgroups/:wfgroup?/wfmembers/:wfmember?/editview/:editview?',
         meta: {

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

@@ -1204,7 +1204,7 @@ export default class WFMemberEditViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1230,7 +1230,7 @@ export default class WFMemberEditViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

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

@@ -1089,9 +1089,9 @@ export default class WFMemberGridViewBase extends Vue {
     protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const batchAddPSAppViews=[
             {view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
-            res:['WFGroup']},
+            res:['WFGroup'],'resAppKey':'groupid'},
             {view:{viewname:'wfuser-mpickup-view',height: 0,width: 0,title: '用户数据多项选择视图'},
-            res:[]}
+            res:['WFUser'],'resAppKey':'userid'}
         ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
@@ -1100,6 +1100,9 @@ export default class WFMemberGridViewBase extends Vue {
         let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
             return (item.res && (item.res[0] !== this.context.srfparentdename));
         })
+        let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
+            return (item.res && (item.res[0] == this.context.srfparentdename));
+        })
         let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
         container.subscribe((result: any) => {
             if (!result || !Object.is(result.ret, 'OK')) {
@@ -1110,8 +1113,10 @@ export default class WFMemberGridViewBase extends Vue {
             }
             let requestParam:Array<any> = [];
             result.datas.forEach((record:any) => {
-                record[this.appEntityService.APPDEKEY] = this.context['srfparentkey'];
-                requestParam.push(record);
+                let tempParam:any = {};
+                tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
+                tempParam[openViewModel.resAppKey] = record.srfkey;
+                requestParam.push(tempParam);
             });
             this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -1177,7 +1182,7 @@ export default class WFMemberGridViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1255,7 +1260,7 @@ export default class WFMemberGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

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

@@ -1204,7 +1204,7 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1230,7 +1230,7 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

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

@@ -1153,7 +1153,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1231,7 +1231,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

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

@@ -1204,7 +1204,7 @@ export default class WFUserEditViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1230,7 +1230,7 @@ export default class WFUserEditViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

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

@@ -1153,7 +1153,7 @@ export default class WFUserGridViewBase extends Vue {
          const _this: any = this;
         if (_this.newdata && _this.newdata instanceof Function) {
             const data: any = {};
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
         }
@@ -1231,7 +1231,7 @@ export default class WFUserGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
             }
-            _this.newdata([{ ...data }], params, $event, xData);
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
             const data2: any = {};
             if (args.length > 0) {

app_web/src/service/entity-service.ts

@@ -587,12 +587,12 @@ export default class EntityService {
      * createBatch接口方法
      *
      * @param {*} [context={}]
-     * @param {*} [data={}]
+     * @param {*} [data]
      * @param {boolean} [isloading]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async createBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async createBatch(context: any = {},data: any, isloading?: boolean): Promise<any> {
         return Http.getInstance().post(`/${this.APPDENAME}/batch`,data,isloading);
     }
 
@@ -600,12 +600,12 @@ export default class EntityService {
      * updateBatch接口方法
      *
      * @param {*} [context={}]
-     * @param {*} [data={}]
+     * @param {*} [data]
      * @param {boolean} [isloading]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async updateBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async updateBatch(context: any = {},data: any, isloading?: boolean): Promise<any> {
         return Http.getInstance().put(`/${this.APPDENAME}/batch`,data,isloading);
     }
 
@@ -613,12 +613,12 @@ export default class EntityService {
      * removeBatch接口方法
      *
      * @param {*} [context={}]
-     * @param {*} [data={}]
+     * @param {*} [data]
      * @param {boolean} [isloading]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async removeBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async removeBatch(context: any = {},data: any, isloading?: boolean): Promise<any> {
         return Http.getInstance().delete(`/${this.APPDENAME}/batch`,isloading,data);
     }
 

app_web/src/service/wfmember/wfmember-service-base.ts

@@ -48,6 +48,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && context.wfmember){
+            return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/select`,isloading);
+        }
         if(context.wfgroup && context.wfmember){
             return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/select`,isloading);
         }
@@ -64,6 +67,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && context.wfmember){
+            return Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/checkkey`,data,isloading);
+        }
         if(context.wfgroup && context.wfmember){
             return Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/checkkey`,data,isloading);
         }
@@ -80,6 +86,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && true){
+            return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/getdraft`,isloading);
+        }
         if(context.wfgroup && true){
             return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/getdraft`,isloading);
         }
@@ -98,6 +107,15 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && true){
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            return Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers`,data,isloading);
+        }
         if(context.wfgroup && true){
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -130,6 +148,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && context.wfmember){
+            return Http.getInstance().delete(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
+        }
         if(context.wfgroup && context.wfmember){
             return Http.getInstance().delete(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
         }
@@ -147,6 +168,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && context.wfmember){
+            return Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/save`,data,isloading);
+        }
         if(context.wfgroup && context.wfmember){
             return Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/save`,data,isloading);
         }
@@ -166,6 +190,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && context.wfmember){
+            return Http.getInstance().put(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,data,isloading);
+        }
         if(context.wfgroup && context.wfmember){
             return Http.getInstance().put(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,data,isloading);
         }
@@ -185,6 +212,9 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && context.wfmember){
+            return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
+        }
         if(context.wfgroup && context.wfmember){
             return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
         }
@@ -203,6 +233,10 @@ export default class WFMemberServiceBase extends EntityService {
      * @memberof WFMemberServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/fetchdefault`,tempData,isloading);
+        }
         if(context.wfgroup && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
             return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/fetchdefault`,tempData,isloading);

app_web/src/service/wfuser/wfuser-service-base.ts

@@ -77,6 +77,7 @@ export default class WFUserServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/wfusers/getdraft`,isloading);
         res.data.wfuser = data.wfuser;
+            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
         return res;
     }
 
@@ -91,8 +92,24 @@ export default class WFUserServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let wfmembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers'),'undefined')){
+            wfmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers') as any);
+            if(wfmembersData && wfmembersData.length && wfmembersData.length > 0){
+                wfmembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.memberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.wfmembers = wfmembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/wfusers/${context.wfuser}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
             return res;
     }
 
@@ -107,8 +124,24 @@ export default class WFUserServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let wfmembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers'),'undefined')){
+            wfmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers') as any);
+            if(wfmembersData && wfmembersData.length && wfmembersData.length > 0){
+                wfmembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.memberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.wfmembers = wfmembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/wfusers/${context.wfuser}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
             return res;
     }
 
@@ -123,6 +156,7 @@ export default class WFUserServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
             return res;
 
     }
@@ -138,6 +172,21 @@ export default class WFUserServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let wfmembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers'),'undefined')){
+            wfmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers') as any);
+            if(wfmembersData && wfmembersData.length && wfmembersData.length > 0){
+                wfmembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.memberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.wfmembers = wfmembersData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -147,6 +196,7 @@ export default class WFUserServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/wfusers`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
         return res;
     }
 

app_web/src/utils/http/http.ts

@@ -78,7 +78,7 @@ export class Http {
             axios({
                 method: 'post',
                 url: url,
-                data: { ...params },
+                data: params,
                 headers: { 'Content-Type': 'application/json;charset=UTF-8', 'Accept': 'application/json' },
                 // transformResponse: [(data: any) => {
                 //     let _data: any = null;

config.xml

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

ibzwf-boot/src/main/resources/application-dev.yml

 server:
-  port: 40003
+  port: 8080
 

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

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

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

@@ -3,11 +3,9 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "40003:40003"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

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

@@ -308,6 +308,130 @@ public class WFMemberResource {
 	}
 
 
+
+    @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)));
+    }
+
+    @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) {
+        WFMember domain = new WFMember();
+        domain.setUserid(wfuser_id);
+        return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain)));
+    }
+
+    @ApiOperation(value = "CreateByWFUser", tags = {"WFMember" },  notes = "CreateByWFUser")
+	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers")
+    @Transactional
+    public ResponseEntity<WFMemberDTO> createByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
+        WFMember domain = wfmemberMapping.toDomain(wfmemberdto);
+        domain.setUserid(wfuser_id);
+		wfmemberService.create(domain);
+        WFMemberDTO dto = wfmemberMapping.toDto(domain);
+		return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @ApiOperation(value = "createBatchByWFUser", tags = {"WFMember" },  notes = "createBatchByWFUser")
+	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/batch")
+    public ResponseEntity<Boolean> createBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
+        List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
+        for(WFMember domain:domainlist){
+            domain.setUserid(wfuser_id);
+        }
+        wfmemberService.createBatch(domainlist);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @ApiOperation(value = "RemoveByWFUser", tags = {"WFMember" },  notes = "RemoveByWFUser")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
+    @Transactional
+    public ResponseEntity<Boolean> removeByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id) {
+		return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id));
+    }
+
+    @ApiOperation(value = "RemoveBatchByWFUser", tags = {"WFMember" },  notes = "RemoveBatchByWFUser")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/batch")
+    public ResponseEntity<Boolean> removeBatchByWFUser(@RequestBody List<String> ids) {
+        wfmemberService.removeBatch(ids);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @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) {
+        WFMember domain = wfmemberMapping.toDomain(wfmemberdto);
+        domain.setUserid(wfuser_id);
+        return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain));
+    }
+
+    @ApiOperation(value = "SaveBatchByWFUser", tags = {"WFMember" },  notes = "SaveBatchByWFUser")
+	@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/savebatch")
+    public ResponseEntity<Boolean> saveBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
+        List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
+        for(WFMember domain:domainlist){
+             domain.setUserid(wfuser_id);
+        }
+        wfmemberService.saveBatch(domainlist);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @ApiOperation(value = "UpdateByWFUser", tags = {"WFMember" },  notes = "UpdateByWFUser")
+	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
+    @Transactional
+    public ResponseEntity<WFMemberDTO> updateByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) {
+        WFMember domain = wfmemberMapping.toDomain(wfmemberdto);
+        domain.setUserid(wfuser_id);
+        domain.setMemberid(wfmember_id);
+		wfmemberService.update(domain);
+        WFMemberDTO dto = wfmemberMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @ApiOperation(value = "UpdateBatchByWFUser", tags = {"WFMember" },  notes = "UpdateBatchByWFUser")
+	@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/batch")
+    public ResponseEntity<Boolean> updateBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
+        List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
+        for(WFMember domain:domainlist){
+            domain.setUserid(wfuser_id);
+        }
+        wfmemberService.updateBatch(domainlist);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @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) {
+        WFMember domain = wfmemberService.get(wfmember_id);
+        WFMemberDTO dto = wfmemberMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+	@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) {
+        context.setN_userid_eq(wfuser_id);
+        Page<WFMember> domains = wfmemberService.searchDefault(context) ;
+        List<WFMemberDTO> list = wfmemberMapping.toDto(domains.getContent());
+	    return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+	@ApiOperation(value = "searchDEFAULTByWFUser", tags = {"WFMember" } ,notes = "searchDEFAULTByWFUser")
+    @RequestMapping(method= RequestMethod.GET , value="/wfusers/{wfuser_id}/wfmembers/searchdefault")
+	public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id,WFMemberSearchContext context) {
+        context.setN_userid_eq(wfuser_id);
+        Page<WFMember> domains = wfmemberService.searchDefault(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(wfmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
+
     /**
      * 用户权限校验
      * @return

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40003
+  port: 8081
\ No newline at end of file

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40003
+  port: 8081