ibiz4j 发布系统代码

app_web/src/mock/entity/ibzorganizations/ibzorganizations.ts

@@ -115,16 +115,16 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).
     return [status, _items];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzorganization 方法: CheckKey");
+// Create
+mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzorganization 方法: Create");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['orgid'];
-    const matchArray:any = new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -134,23 +134,11 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$
             });
         });
     }
-    //let items = mockDatas ? mockDatas : [];
-    //let _items = items.find((item: any) => Object.is(item.orgid, tempValue.orgid));
-      let data = JSON.parse(config.data);
-    mockDatas.forEach((item)=>{
-        if(item['orgid'] == tempValue['orgid'] ){
-            for(let value in data){
-              if(item.hasOwnProperty(value)){
-                  item[value] = data[value];
-              }
-            }
-        }
-    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(data);
+    console.table(mockDatas[0]);
     console.groupEnd();
     console.groupEnd();
-    return [status, data];
+    return [status, mockDatas[0]];
 });
         
 // Update
@@ -190,17 +178,33 @@ mock.onPut(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((
     console.groupEnd();
     return [status, data];
 });
+
+// GetDraft
+mock.onGet(new RegExp(/^\/ibzorganizations\/getdraft$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzorganization 方法: GetDraft");
+    console.table({url:config.url, method: config.method, data:config.data});
+    // GetDraft
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
         
-// Create
-mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzorganization 方法: Create");
+// CheckKey
+mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzorganization 方法: CheckKey");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['orgid'];
-    const matchArray:any = new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -210,11 +214,23 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply(
             });
         });
     }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.orgid, tempValue.orgid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['orgid'] == tempValue['orgid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(mockDatas[0]);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, mockDatas[0]];
+    return [status, data];
 });
         
 // Save
@@ -254,22 +270,6 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).
     console.groupEnd();
     return [status, data];
 });
-
-// GetDraft
-mock.onGet(new RegExp(/^\/ibzorganizations\/getdraft$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzorganization 方法: GetDraft");
-    console.table({url:config.url, method: config.method, data:config.data});
-    // GetDraft
-    let status = MockAdapter.mockStatus(config);
-    if (status !== 200) {
-        return [status, null];
-    }
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table({});
-    console.groupEnd();
-    console.groupEnd();
-    return [status, {}];
-});
     
 // FetchDefault
 mock.onGet(new RegExp(/^\/ibzorganizations\/fetchdefault$/)).reply((config: any) => {

app_web/src/mock/entity/ibzposts/ibzposts.ts

@@ -115,6 +115,32 @@ mock.onGet(new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((c
     return [status, _items];
 });
         
+// Create
+mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzpost 方法: Create");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['postid'];
+    const matchArray:any = new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas[0]);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas[0]];
+});
+        
 // Update
 mock.onPut(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibzpost 方法: Update");
@@ -169,16 +195,16 @@ mock.onGet(new RegExp(/^\/ibzposts\/getdraft$/)).reply((config: any) => {
     return [status, {}];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzpost 方法: Save");
+// CheckKey
+mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzpost 方法: CheckKey");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['postid'];
-    const matchArray:any = new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -207,16 +233,16 @@ mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((c
     return [status, data];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzpost 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzpost 方法: Save");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['postid'];
-    const matchArray:any = new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -244,32 +270,6 @@ mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).repl
     console.groupEnd();
     return [status, data];
 });
-        
-// Create
-mock.onPost(new RegExp(/^\/ibzposts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzpost 方法: Create");
-    console.table({url:config.url, method: config.method, data:config.data});
-    let status = MockAdapter.mockStatus(config);
-    if (status !== 200) {
-        return [status, null];
-    }    
-    const paramArray:Array<any> = ['postid'];
-    const matchArray:any = new RegExp(/^\/ibzposts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
-    let tempValue: any = {};
-    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
-        paramArray.forEach((item: any, index: number) => {
-            Object.defineProperty(tempValue, item, {
-                enumerable: true,
-                value: matchArray[index + 1]
-            });
-        });
-    }
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(mockDatas[0]);
-    console.groupEnd();
-    console.groupEnd();
-    return [status, mockDatas[0]];
-});
     
 // FetchDefault
 mock.onGet(new RegExp(/^\/ibzposts\/fetchdefault$/)).reply((config: any) => {

app_web/src/mock/entity/ibzteams/ibzteams.ts

@@ -115,9 +115,9 @@ mock.onGet(new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((c
     return [status, _items];
 });
         
-// Update
-mock.onPut(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzteam 方法: Update");
+// Create
+mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzteam 方法: Create");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -134,35 +134,23 @@ mock.onPut(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config:
             });
         });
     }
-    //let items = mockDatas ? mockDatas : [];
-    //let _items = items.find((item: any) => Object.is(item.teamid, tempValue.teamid));
-      let data = JSON.parse(config.data);
-    mockDatas.forEach((item)=>{
-        if(item['teamid'] == tempValue['teamid'] ){
-            for(let value in data){
-              if(item.hasOwnProperty(value)){
-                  item[value] = data[value];
-              }
-            }
-        }
-    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(data);
+    console.table(mockDatas[0]);
     console.groupEnd();
     console.groupEnd();
-    return [status, data];
+    return [status, mockDatas[0]];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzteam 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzteam 方法: Update");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['teamid'];
-    const matchArray:any = new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -245,16 +233,16 @@ mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).repl
     return [status, data];
 });
         
-// Create
-mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:ibzteam 方法: Create");
+// Save
+mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:ibzteam 方法: Save");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, null];
     }    
     const paramArray:Array<any> = ['teamid'];
-    const matchArray:any = new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
     let tempValue: any = {};
     if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
         paramArray.forEach((item: any, index: number) => {
@@ -264,11 +252,23 @@ mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config:
             });
         });
     }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.teamid, tempValue.teamid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['teamid'] == tempValue['teamid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(mockDatas[0]);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, mockDatas[0]];
+    return [status, data];
 });
     
 // FetchDefault

app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue

@@ -1140,14 +1140,63 @@ export default class IBZDepartmentGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZDepartmentGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.ibzorganization && true){
+            deResParameters = [
+            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'ibzdepartment-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.ibzdepartment.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
 
     /**
      * 新建

app_web/src/pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view-base.vue

@@ -747,9 +747,18 @@ export default class IBZDepartmentMPickupViewBase extends Vue {
                     newSelections.push(this.viewSelections[index]);
                 }
             });
-            this.viewSelections = newSelections;
+            this.viewSelections = this.removeDuplicates([...newSelections,...this.viewSelections]);
         });
-        this.selectedData = JSON.stringify(this.viewSelections);
+    }
+
+    /**
+     * 去重
+     *
+     * @memberof IBZDepartmentMPickupViewBase
+     */
+    public removeDuplicates(data:any):Array<any> {
+        const uniqueSet = new Set(data);
+        return [...uniqueSet];
     }
 
     /**

app_web/src/pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view-base.vue

@@ -558,14 +558,29 @@ export default class IBZDepartmentTreeExpViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZDepartmentTreeExpView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+    this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
+    }
+
 
 
     /**

app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue

@@ -1038,14 +1038,62 @@ export default class IBZDeptMemberGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZDeptMemberGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.ibzdepartment && true){
+            deResParameters = [
+            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+        ];
+        const _this: any = this;
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'ibzdept-member-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.ibzdeptmember.views.editview.title'),
+        };
+        openPopupModal(view, data);
+    }
+
 
     /**
      * 新建

app_web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue

@@ -1182,14 +1182,63 @@ export default class IBZEmployeeGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZEmployeeGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.ibzdepartment && true){
+            deResParameters = [
+            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'ibzemployee-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.ibzemployee.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
 
     /**
      * 新建

app_web/src/pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view-base.vue

@@ -747,9 +747,18 @@ export default class IBZEmployeeMPickupViewBase extends Vue {
                     newSelections.push(this.viewSelections[index]);
                 }
             });
-            this.viewSelections = newSelections;
+            this.viewSelections = this.removeDuplicates([...newSelections,...this.viewSelections]);
         });
-        this.selectedData = JSON.stringify(this.viewSelections);
+    }
+
+    /**
+     * 去重
+     *
+     * @memberof IBZEmployeeMPickupViewBase
+     */
+    public removeDuplicates(data:any):Array<any> {
+        const uniqueSet = new Set(data);
+        return [...uniqueSet];
     }
 
     /**

app_web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue

@@ -1138,14 +1138,58 @@ export default class IBZOrganizationGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZOrganizationGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'ibzorganization-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.ibzorganization.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
 
     /**
      * 新建

app_web/src/pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view-base.vue

@@ -558,14 +558,29 @@ export default class IBZOrganizationTreeExpViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZOrganizationTreeExpView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+    this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
+    }
+
 
 
     /**

app_web/src/pages/ou/ibzpost-grid-view/ibzpost-grid-view-base.vue

@@ -1083,14 +1083,44 @@ export default class IBZPostGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZPostGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibzposts', parameterName: 'ibzpost' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const _this: any = this;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
+        }
+        openIndexViewTab(data);
+    }
+
 
     /**
      * 新建

app_web/src/pages/ou/ibzteam-grid-view/ibzteam-grid-view-base.vue

@@ -1083,14 +1083,44 @@ export default class IBZTeamGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZTeamGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibzteams', parameterName: 'ibzteam' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const _this: any = this;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
+        }
+        openIndexViewTab(data);
+    }
+
 
     /**
      * 新建

app_web/src/pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view-base.vue

@@ -1103,14 +1103,49 @@ export default class IBZTeamMemberGridViewBase extends Vue {
     }
 
 
-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #if ctrl.getPSControlContainer().getV...  [in template "TEMPLCODE_zh_CN" at line 43, column 5]
-----
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZTeamMemberGridView
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.ibzemployee && true){
+            deResParameters = [
+            { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'ibzteammembers', parameterName: 'ibzteammember' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const _this: any = this;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
+        }
+        openIndexViewTab(data);
+    }
+
 
     /**
      * 新建

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

@@ -52,68 +52,6 @@ export default class IBZOrganizationServiceBase extends EntityService {
         return res;
     }
 
-    /**
-     * CheckKey接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof IBZOrganizationServiceBase
-     */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/checkkey`,data,isloading);
-        return res;
-    }
-
-    /**
-     * Update接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof IBZOrganizationServiceBase
-     */
-    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let masterData:any = {};
-        let ibzemployeesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
-            ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
-            if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
-                ibzemployeesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.userid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.ibzemployees = ibzemployeesData;
-        let ibzdepartmentsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdepartments'),'undefined')){
-            ibzdepartmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdepartments') as any);
-            if(ibzdepartmentsData && ibzdepartmentsData.length && ibzdepartmentsData.length > 0){
-                ibzdepartmentsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.deptid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.ibzdepartments = ibzdepartmentsData;
-        Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
-            this.tempStorage.setItem(context.srfsessionkey+'_ibzdepartments',JSON.stringify(res.data.ibzdepartments));
-        return res;
-    }
-
     /**
      * Create接口方法
      *
@@ -170,7 +108,7 @@ export default class IBZOrganizationServiceBase extends EntityService {
     }
 
     /**
-     * Save接口方法
+     * Update接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -178,7 +116,7 @@ export default class IBZOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZOrganizationServiceBase
      */
-    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
         let ibzemployeesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
@@ -211,7 +149,7 @@ export default class IBZOrganizationServiceBase extends EntityService {
         }
         masterData.ibzdepartments = ibzdepartmentsData;
         Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/save`,data,isloading);
+            let res:any = await  Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
             this.tempStorage.setItem(context.srfsessionkey+'_ibzdepartments',JSON.stringify(res.data.ibzdepartments));
         return res;
@@ -264,6 +202,68 @@ export default class IBZOrganizationServiceBase extends EntityService {
         return res;
     }
 
+    /**
+     * CheckKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IBZOrganizationServiceBase
+     */
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/checkkey`,data,isloading);
+        return res;
+    }
+
+    /**
+     * Save接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IBZOrganizationServiceBase
+     */
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        let ibzemployeesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
+            ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
+            if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
+                ibzemployeesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.userid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzemployees = ibzemployeesData;
+        let ibzdepartmentsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdepartments'),'undefined')){
+            ibzdepartmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdepartments') as any);
+            if(ibzdepartmentsData && ibzdepartmentsData.length && ibzdepartmentsData.length > 0){
+                ibzdepartmentsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.deptid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzdepartments = ibzdepartmentsData;
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzdepartments',JSON.stringify(res.data.ibzdepartments));
+        return res;
+    }
+
     /**
      * FetchDefault接口方法
      *

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

@@ -53,7 +53,7 @@ export default class IBZPostServiceBase extends EntityService {
     }
 
     /**
-     * Update接口方法
+     * Create接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -61,15 +61,22 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
         Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().put(`/ibzposts/${context.ibzpost}`,data,isloading);
+        if(!data.srffrontuf || data.srffrontuf !== "1"){
+            data[this.APPDEKEY] = null;
+        }
+        if(data.srffrontuf){
+            delete data.srffrontuf;
+        }
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        let res:any = await Http.getInstance().post(`/ibzposts`,data,isloading);
         return res;
     }
 
     /**
-     * GetDraft接口方法
+     * Update接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -77,14 +84,15 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await  Http.getInstance().get(`/ibzposts/getdraft`,isloading);
-        res.data.ibzpost = data.ibzpost;
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/ibzposts/${context.ibzpost}`,data,isloading);
         return res;
     }
 
     /**
-     * Save接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -92,15 +100,13 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let masterData:any = {};
-        Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().post(`/ibzposts/${context.ibzpost}/save`,data,isloading);
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
         return res;
     }
 
     /**
-     * CheckKey接口方法
+     * Get接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -108,13 +114,13 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await Http.getInstance().get(`/ibzposts/${context.ibzpost}`,isloading);
         return res;
     }
 
     /**
-     * Remove接口方法
+     * GetDraft接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -122,13 +128,14 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/ibzposts/getdraft`,isloading);
+        res.data.ibzpost = data.ibzpost;
         return res;
     }
 
     /**
-     * Get接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -136,13 +143,13 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await Http.getInstance().get(`/ibzposts/${context.ibzpost}`,isloading);
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
         return res;
     }
 
     /**
-     * Create接口方法
+     * Save接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -150,17 +157,10 @@ export default class IBZPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof IBZPostServiceBase
      */
-    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
         Object.assign(data,masterData);
-        if(!data.srffrontuf || data.srffrontuf !== "1"){
-            data[this.APPDEKEY] = null;
-        }
-        if(data.srffrontuf){
-            delete data.srffrontuf;
-        }
-        let tempContext:any = JSON.parse(JSON.stringify(context));
-        let res:any = await Http.getInstance().post(`/ibzposts`,data,isloading);
+            let res:any = await  Http.getInstance().post(`/ibzposts/${context.ibzpost}/save`,data,isloading);
         return res;
     }
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZDepartmentService.java

@@ -28,18 +28,18 @@ public interface IIBZDepartmentService extends IService<IBZDepartment>{
     boolean create(IBZDepartment et) ;
     @CacheEvict(value="ibzdepartment",allEntries=true)
     void createBatch(List<IBZDepartment> list) ;
-    IBZDepartment get(String key) ;
-    boolean save(IBZDepartment et) ;
+    boolean update(IBZDepartment et) ;
     @CacheEvict(value="ibzdepartment",allEntries=true)
-    void saveBatch(List<IBZDepartment> list) ;
-    boolean checkKey(IBZDepartment et) ;
-    IBZDepartment getDraft(IBZDepartment et) ;
+    void updateBatch(List<IBZDepartment> list) ;
     boolean remove(String key) ;
     @CacheEvict(value="ibzdepartment",allEntries=true)
     void removeBatch(Collection<String> idList) ;
-    boolean update(IBZDepartment et) ;
+    IBZDepartment get(String key) ;
+    IBZDepartment getDraft(IBZDepartment et) ;
+    boolean checkKey(IBZDepartment et) ;
+    boolean save(IBZDepartment et) ;
     @CacheEvict(value="ibzdepartment",allEntries=true)
-    void updateBatch(List<IBZDepartment> list) ;
+    void saveBatch(List<IBZDepartment> list) ;
     Page<IBZDepartment> searchDefault(IBZDepartmentSearchContext context) ;
     List<IBZDepartment> selectByParentdeptid(String deptid) ;
     @CacheEvict(value="ibzdepartment",allEntries=true)

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZDeptMemberService.java

@@ -25,17 +25,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIBZDeptMemberService extends IService<IBZDeptMember>{
 
-    boolean update(IBZDeptMember et) ;
-    void updateBatch(List<IBZDeptMember> list) ;
     boolean create(IBZDeptMember et) ;
     void createBatch(List<IBZDeptMember> list) ;
-    boolean save(IBZDeptMember et) ;
-    void saveBatch(List<IBZDeptMember> list) ;
-    IBZDeptMember getDraft(IBZDeptMember et) ;
-    IBZDeptMember get(String key) ;
+    boolean update(IBZDeptMember et) ;
+    void updateBatch(List<IBZDeptMember> list) ;
     boolean remove(String key) ;
     void removeBatch(Collection<String> idList) ;
+    IBZDeptMember get(String key) ;
+    IBZDeptMember getDraft(IBZDeptMember et) ;
     boolean checkKey(IBZDeptMember et) ;
+    boolean save(IBZDeptMember et) ;
+    void saveBatch(List<IBZDeptMember> list) ;
     Page<IBZDeptMember> searchDefault(IBZDeptMemberSearchContext context) ;
     List<IBZDeptMember> selectByDeptid(String deptid) ;
     void removeByDeptid(String deptid) ;

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZEmployeeService.java

@@ -25,22 +25,22 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIBZEmployeeService extends IService<IBZEmployee>{
 
-    boolean remove(String key) ;
-    @CacheEvict(value="ibzemployee",allEntries=true)
-    void removeBatch(Collection<String> idList) ;
-    IBZEmployee initPwd(IBZEmployee et) ;
     boolean create(IBZEmployee et) ;
     @CacheEvict(value="ibzemployee",allEntries=true)
     void createBatch(List<IBZEmployee> list) ;
-    boolean checkKey(IBZEmployee et) ;
     boolean update(IBZEmployee et) ;
     @CacheEvict(value="ibzemployee",allEntries=true)
     void updateBatch(List<IBZEmployee> list) ;
-    boolean save(IBZEmployee et) ;
+    boolean remove(String key) ;
     @CacheEvict(value="ibzemployee",allEntries=true)
-    void saveBatch(List<IBZEmployee> list) ;
+    void removeBatch(Collection<String> idList) ;
     IBZEmployee get(String key) ;
     IBZEmployee getDraft(IBZEmployee et) ;
+    boolean checkKey(IBZEmployee et) ;
+    IBZEmployee initPwd(IBZEmployee et) ;
+    boolean save(IBZEmployee et) ;
+    @CacheEvict(value="ibzemployee",allEntries=true)
+    void saveBatch(List<IBZEmployee> list) ;
     Page<IBZEmployee> searchDefault(IBZEmployeeSearchContext context) ;
     List<IBZEmployee> selectByMdeptid(String deptid) ;
     @CacheEvict(value="ibzemployee",allEntries=true)