ibiz4j 发布系统代码 [ibz-ou，统一组织单位]

app_web/src/components/app-menu-item/app-menu-item.vue

@@ -13,7 +13,7 @@
                         <template v-else>
                             <i v-if="isFirst" class='fa fa-cogs app-menu-icon'></i>
                         </template>
-                        <span ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                        <span ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                     </template>
                     <app-menu-item :isCollapse="isCollapse" :menus="item.items" :ctrlName="ctrlName" :isFirst="false" :counterdata="counterdata" :popper-class="popperClass"></app-menu-item>
                 </el-submenu>
@@ -23,18 +23,18 @@
                     <el-menu-item :class="[{'isFirst' : isFirst},item.textcls]" v-show="!item.hidden" :index="item.name" :key="item.id">
                         <template v-if="item.icon && item.icon != ''">
                             <img :src="item.icon" class='app-menu-icon' />
-                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                         </template>
                         <template v-else-if="item.iconcls && item.iconcls != ''">
                             <i :class="[item.iconcls, 'app-menu-icon']"></i>
-                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                         </template>
                         <template v-else>
                             <i v-if="isFirst" class='fa fa-cogs app-menu-icon'></i>
-                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span v-if="(isFirst && isCollapse) ? true : false" ref="circleText" :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                         </template>
                         <template slot="title">
-                            <span :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+                            <span :class="{'app-menu-circle' : appMenuCollapseFlag, 'text' : true}" :title="$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)">{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
                             <template v-if="counterdata && counterdata[item.counterid] && counterdata[item.counterid] > 0">
                                 <span class="pull-right">
                                     <badge :count="counterdata[item.counterid]" :overflow-count="9999"></badge>

app_web/src/components/app-quick-menus/app-quick-menus.vue

@@ -8,7 +8,7 @@
             <img :src="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
             <i class="fa fa-cogs" v-else></i>
           </span>
-          <span>{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
+          <span>{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</span>
           <span class="line"></span>
         </p>
         <p style=" display: 'flex' ">
@@ -37,7 +37,7 @@
             <img :src="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
             <i class="fa fa-cogs" v-else></i>
           </span>
-          <h4>{{$t(`app.menus.${ctrlName}.${item.name}`)}}</h4>
+          <h4>{{$t(`app.menus.${ctrlName}.${item.name.toLowerCase()}`)}}</h4>
         </div>
       </card>
     </template>

app_web/src/engine/view/grid-view8-engine.ts

@@ -9,14 +9,6 @@ import GridViewEngine from './grid-view-engine';
  */
 export default class GridView8Engine extends GridViewEngine {
 
-    /**
-     * 表格部件
-     *
-     * @type {*}
-     * @memberof GridView8Engine
-     */
-    protected grid: any;
-
     /**
      * 表格部件
      *

app_web/src/locale/lang/BO-CN-base.ts

@@ -36,6 +36,8 @@ function getAppLocale(){
                 nomore:"དེ་ལས་མང་བ་མི་འདུག",
                 other:"གཞན་དག",
                 valueNotEmpty:"སྟོང་མི་ཆོག",
+                createFailed:"གསར་འཛུགས་ཕམ་པ།",
+                isExist:"གནས་པ་",
             },
             local:{
                 new: "གསར་འཛུགས།",

app_web/src/locale/lang/en-US-base.ts

@@ -36,6 +36,8 @@ function getAppLocale(){
                 nomore:"No more",
                 other:"other",
                 valueNotEmpty:"The value cannot be null",
+                createFailed:"Create Failed",
+                isExist:"Exist",
             },
             local:{
                 new: "New",

app_web/src/locale/lang/zh-CN-base.ts

@@ -36,6 +36,8 @@ function getAppLocale(){
                 nomore:"没有更多了",
                 other:"其他",
                 valueNotEmpty:"值不能为空",
+                createFailed:"创建失败",
+                isExist:"已存在",
             },
             local:{
                 new: "新建",

app_web/src/mock/entity/sys-organizations/sys-organizations.ts

@@ -87,16 +87,16 @@ mock.onDelete(new RegExp(/^\/sysorganizations\/batch$/)).reply((config: any) =>
 });
 
         
-// Select
-mock.onGet(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
-    console.groupCollapsed("实体:sysorganization 方法: Select");
+// CheckKey
+mock.onPost(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sysorganization 方法: 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(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/sysorganizations\/([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) => {
@@ -106,13 +106,23 @@ mock.onGet(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).
             });
         });
     }
-    let items = mockDatas ? mockDatas : [];
-    let _items = items.find((item: any) => Object.is(item.orgid, tempValue.orgid));
+    //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(_items);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, _items];
+    return [status, data];
 });
         
 // Create
@@ -141,44 +151,6 @@ mock.onPost(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply(
     return [status, mockDatas[0]];
 });
 
-// Update
-mock.onPut(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:sysorganization 方法: 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> = ['orgid'];
-    const matchArray:any = new RegExp(/^\/sysorganizations\/([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]
-            });
-        });
-    }
-    //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.groupEnd();
-    console.groupEnd();
-    return [status, data];
-});
-
 // GetDraft
 mock.onGet(new RegExp(/^\/sysorganizations\/getdraft$/)).reply((config: any) => {
     console.groupCollapsed("实体:sysorganization 方法: GetDraft");
@@ -195,16 +167,16 @@ mock.onGet(new RegExp(/^\/sysorganizations\/getdraft$/)).reply((config: any) =>
     return [status, {}];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:sysorganization 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sysorganization 方法: 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> = ['orgid'];
-    const matchArray:any = new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/sysorganizations\/([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) => {
@@ -233,16 +205,16 @@ mock.onPost(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$
     return [status, data];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:sysorganization 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/sysorganizations\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sysorganization 方法: 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> = ['orgid'];
-    const matchArray:any = new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/sysorganizations\/([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) => {
@@ -366,10 +338,38 @@ mock.onGet(new RegExp(/^\/sysorganizations\/fetchtoporg(\?[\w-./?%&=,]*)*$/)).re
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 
+// Select
+mock.onGet(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sysorganization 方法: Select");
+    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(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})\/select$/).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]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.orgid, tempValue.orgid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+
 
-// Remove
-mock.onDelete(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:sysorganization 方法: Remove");
+// Get
+mock.onGet(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sysorganization 方法: Get");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -395,9 +395,9 @@ mock.onDelete(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})$/)).reply
     return [status, _items?_items:{}];
 });
 
-// Get
-mock.onGet(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:sysorganization 方法: Get");
+// Remove
+mock.onDelete(new RegExp(/^\/sysorganizations\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sysorganization 方法: Remove");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {

app_web/src/mock/entity/sys-posts/sys-posts.ts

@@ -87,16 +87,16 @@ mock.onDelete(new RegExp(/^\/sysposts\/batch$/)).reply((config: any) => {
 });
 
         
-// Select
-mock.onGet(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
-    console.groupCollapsed("实体:syspost 方法: Select");
+// CheckKey
+mock.onPost(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:syspost 方法: 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(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/sysposts\/([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) => {
@@ -106,13 +106,23 @@ mock.onGet(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((c
             });
         });
     }
-    let items = mockDatas ? mockDatas : [];
-    let _items = items.find((item: any) => Object.is(item.postid, tempValue.postid));
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.postid, tempValue.postid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['postid'] == tempValue['postid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
     console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(_items);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, _items];
+    return [status, data];
 });
         
 // Create
@@ -141,44 +151,6 @@ mock.onPost(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config:
     return [status, mockDatas[0]];
 });
 
-// Update
-mock.onPut(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:syspost 方法: 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> = ['postid'];
-    const matchArray:any = new RegExp(/^\/sysposts\/([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]
-            });
-        });
-    }
-    //let items = mockDatas ? mockDatas : [];
-    //let _items = items.find((item: any) => Object.is(item.postid, tempValue.postid));
-      let data = JSON.parse(config.data);
-    mockDatas.forEach((item)=>{
-        if(item['postid'] == tempValue['postid'] ){
-            for(let value in data){
-              if(item.hasOwnProperty(value)){
-                  item[value] = data[value];
-              }
-            }
-        }
-    })
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(data);
-    console.groupEnd();
-    console.groupEnd();
-    return [status, data];
-});
-
 // GetDraft
 mock.onGet(new RegExp(/^\/sysposts\/getdraft$/)).reply((config: any) => {
     console.groupCollapsed("实体:syspost 方法: GetDraft");
@@ -195,16 +167,16 @@ mock.onGet(new RegExp(/^\/sysposts\/getdraft$/)).reply((config: any) => {
     return [status, {}];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:syspost 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:syspost 方法: 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(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/sysposts\/([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) => {
@@ -233,16 +205,16 @@ mock.onPost(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).repl
     return [status, data];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:syspost 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/sysposts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:syspost 方法: 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> = ['postid'];
-    const matchArray:any = new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/sysposts\/([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) => {
@@ -322,10 +294,38 @@ mock.onGet(new RegExp(/^\/sysposts\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((co
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 
+// Select
+mock.onGet(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:syspost 方法: Select");
+    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(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})\/select$/).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]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.postid, tempValue.postid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+
 
-// Remove
-mock.onDelete(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:syspost 方法: Remove");
+// Get
+mock.onGet(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:syspost 方法: Get");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -351,9 +351,9 @@ mock.onDelete(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config
     return [status, _items?_items:{}];
 });
 
-// Get
-mock.onGet(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:syspost 方法: Get");
+// Remove
+mock.onDelete(new RegExp(/^\/sysposts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:syspost 方法: Remove");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {

app_web/src/mock/entity/sys-teams/sys-teams.ts

@@ -87,16 +87,16 @@ mock.onDelete(new RegExp(/^\/systeams\/batch$/)).reply((config: any) => {
 });
 
         
-// Select
-mock.onGet(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
-    console.groupCollapsed("实体:systeam 方法: Select");
+// CheckKey
+mock.onPost(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:systeam 方法: 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> = ['teamid'];
-    const matchArray:any = new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/systeams\/([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) => {
@@ -106,13 +106,23 @@ mock.onGet(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((c
             });
         });
     }
-    let items = mockDatas ? mockDatas : [];
-    let _items = items.find((item: any) => Object.is(item.teamid, tempValue.teamid));
+    //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(_items);
+    console.table(data);
     console.groupEnd();
     console.groupEnd();
-    return [status, _items];
+    return [status, data];
 });
         
 // Create
@@ -141,44 +151,6 @@ mock.onPost(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config:
     return [status, mockDatas[0]];
 });
 
-// Update
-mock.onPut(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:systeam 方法: 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(/^\/systeams\/([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]
-            });
-        });
-    }
-    //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.groupEnd();
-    console.groupEnd();
-    return [status, data];
-});
-
 // GetDraft
 mock.onGet(new RegExp(/^\/systeams\/getdraft$/)).reply((config: any) => {
     console.groupCollapsed("实体:systeam 方法: GetDraft");
@@ -195,16 +167,16 @@ mock.onGet(new RegExp(/^\/systeams\/getdraft$/)).reply((config: any) => {
     return [status, {}];
 });
         
-// CheckKey
-mock.onPost(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
-    console.groupCollapsed("实体:systeam 方法: CheckKey");
+// Save
+mock.onPost(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:systeam 方法: 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(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/systeams\/([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) => {
@@ -233,16 +205,16 @@ mock.onPost(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).repl
     return [status, data];
 });
         
-// Save
-mock.onPost(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
-    console.groupCollapsed("实体:systeam 方法: Save");
+// Update
+mock.onPut(new RegExp(/^\/systeams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:systeam 方法: 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(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    const matchArray:any = new RegExp(/^\/systeams\/([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) => {
@@ -322,10 +294,38 @@ mock.onGet(new RegExp(/^\/systeams\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((co
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 
+// Select
+mock.onGet(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:systeam 方法: Select");
+    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(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})\/select$/).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]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.teamid, tempValue.teamid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+
 
-// Remove
-mock.onDelete(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:systeam 方法: Remove");
+// Get
+mock.onGet(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:systeam 方法: Get");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
@@ -351,9 +351,9 @@ mock.onDelete(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config
     return [status, _items?_items:{}];
 });
 
-// Get
-mock.onGet(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
-    console.groupCollapsed("实体:systeam 方法: Get");
+// Remove
+mock.onDelete(new RegExp(/^\/systeams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:systeam 方法: Remove");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {

app_web/src/pages/ou/sys-department-mpickup-view/sys-department-mpickup-view-base.vue

@@ -843,7 +843,7 @@ export default class SysDepartmentMPickupViewBase extends Vue {
             }
             if(model.datas.length>0){
                 model.datas.forEach((data:any,index:any)=>{
-                    Object.assign(data,{srfmajortext: data['deptname']});
+                    Object.assign(data,{srfmajortext: data.hasOwnProperty('srfmajortext') ? data['srfmajortext'] : data['deptname']});
                 })
             }
             model.datas.forEach((item: any) => {

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

@@ -884,6 +884,8 @@ export default class SysDeptMemberGridViewBase extends Vue {
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         let localContext:any = null;
         let localViewParam:any =null;
+        let tempContext:any = this.$util.deepCopy(this.context);
+        let data:any = this.$util.deepCopy(args[0]);
         let batchAddPSAppViews:Array<any>=[];
         batchAddPSAppViews=[
             {view:{viewname:'sys-employee-mpickup-view',height: 0,width: 0,title: '人员数据多项选择视图'},
@@ -903,7 +905,7 @@ export default class SysDeptMemberGridViewBase extends Vue {
         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]);
+        let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, tempContext, data);
         container.subscribe((result: any) => {
             if (!result || !Object.is(result.ret, 'OK')) {
                 return;

app_web/src/pages/ou/sys-employee-mpickup-view/sys-employee-mpickup-view-base.vue

@@ -843,7 +843,7 @@ export default class SysEmployeeMPickupViewBase extends Vue {
             }
             if(model.datas.length>0){
                 model.datas.forEach((data:any,index:any)=>{
-                    Object.assign(data,{srfmajortext: data['personname']});
+                    Object.assign(data,{srfmajortext: data.hasOwnProperty('srfmajortext') ? data['srfmajortext'] : data['personname']});
                 })
             }
             model.datas.forEach((item: any) => {

app_web/src/service/sys-department/sys-department-service-base.ts

@@ -39,7 +39,7 @@ export default class SysDepartmentServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * Select接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -47,14 +47,15 @@ export default class SysDepartmentServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysDepartmentServiceBase
      */
-    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysorganization && context.sysdepartment){
-            let res:any = Http.getInstance().get(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}/select`,isloading);
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}/checkkey`,data,isloading);
             
             return res;
         }
-            let res:any = Http.getInstance().get(`/sysdepartments/${context.sysdepartment}/select`,isloading);
-            
+            let res:any = Http.getInstance().post(`/sysdepartments/${context.sysdepartment}/checkkey`,data,isloading);
             return res;
     }
 
@@ -101,7 +102,7 @@ export default class SysDepartmentServiceBase extends EntityService {
     }
 
     /**
-     * Update接口方法
+     * Get接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -109,41 +110,19 @@ export default class SysDepartmentServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysDepartmentServiceBase
      */
-    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysorganization && context.sysdepartment){
-            let masterData:any = {};
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}`,data,isloading);
+            let res:any = await Http.getInstance().get(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}`,isloading);
             
             return res;
         }
-        let masterData:any = {};
-        Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().put(`/sysdepartments/${context.sysdepartment}`,data,isloading);
+            let res:any = await Http.getInstance().get(`/sysdepartments/${context.sysdepartment}`,isloading);
             
             return res;
     }
 
     /**
-     * Remove接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof SysDepartmentServiceBase
-     */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.sysorganization && context.sysdepartment){
-            let res:any = Http.getInstance().delete(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}`,isloading);
-            return res;
-        }
-            let res:any = Http.getInstance().delete(`/sysdepartments/${context.sysdepartment}`,isloading);
-            return res;
-    }
-
-    /**
-     * Get接口方法
+     * GetDraft接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -151,19 +130,21 @@ export default class SysDepartmentServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysDepartmentServiceBase
      */
-    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.sysorganization && context.sysdepartment){
-            let res:any = await Http.getInstance().get(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}`,isloading);
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sysorganization && true){
+            let res:any = await Http.getInstance().get(`/sysorganizations/${context.sysorganization}/sysdepartments/getdraft`,isloading);
+            res.data.sysdepartment = data.sysdepartment;
             
             return res;
         }
-            let res:any = await Http.getInstance().get(`/sysdepartments/${context.sysdepartment}`,isloading);
+        let res:any = await  Http.getInstance().get(`/sysdepartments/getdraft`,isloading);
+        res.data.sysdepartment = data.sysdepartment;
         
         return res;
     }
 
     /**
-     * GetDraft接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -171,21 +152,17 @@ export default class SysDepartmentServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysDepartmentServiceBase
      */
-    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.sysorganization && true){
-            let res:any = await Http.getInstance().get(`/sysorganizations/${context.sysorganization}/sysdepartments/getdraft`,isloading);
-            res.data.sysdepartment = data.sysdepartment;
-            
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sysorganization && context.sysdepartment){
+            let res:any = Http.getInstance().delete(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}`,isloading);
             return res;
         }
-        let res:any = await  Http.getInstance().get(`/sysdepartments/getdraft`,isloading);
-        res.data.sysdepartment = data.sysdepartment;
-        
+            let res:any = Http.getInstance().delete(`/sysdepartments/${context.sysdepartment}`,isloading);
             return res;
     }
 
     /**
-     * CheckKey接口方法
+     * Save接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -193,20 +170,23 @@ export default class SysDepartmentServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysDepartmentServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysorganization && context.sysdepartment){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}/checkkey`,data,isloading);
+            let res:any = await Http.getInstance().post(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}/save`,data,isloading);
             
             return res;
         }
-            let res:any = Http.getInstance().post(`/sysdepartments/${context.sysdepartment}/checkkey`,data,isloading);
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/sysdepartments/${context.sysdepartment}/save`,data,isloading);
+            
             return res;
     }
 
     /**
-     * Save接口方法
+     * Update接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -214,17 +194,17 @@ export default class SysDepartmentServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysDepartmentServiceBase
      */
-    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysorganization && context.sysdepartment){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}/save`,data,isloading);
+            let res:any = await Http.getInstance().put(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}`,data,isloading);
             
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().post(`/sysdepartments/${context.sysdepartment}/save`,data,isloading);
+            let res:any = await  Http.getInstance().put(`/sysdepartments/${context.sysdepartment}`,data,isloading);
             
             return res;
     }
@@ -266,4 +246,24 @@ export default class SysDepartmentServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return await Http.getInstance().post(`/sysdepartments/searchdefault`,tempData,isloading);
     }
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysDepartmentServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sysorganization && context.sysdepartment){
+            let res:any = Http.getInstance().get(`/sysorganizations/${context.sysorganization}/sysdepartments/${context.sysdepartment}/select`,isloading);
+            
+            return res;
+        }
+            let res:any = Http.getInstance().get(`/sysdepartments/${context.sysdepartment}/select`,isloading);
+            
+            return res;
+    }
 }
\ No newline at end of file

app_web/src/service/sys-organization/sys-organization-service-base.ts

@@ -39,7 +39,7 @@ export default class SysOrganizationServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * Select接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -47,9 +47,8 @@ export default class SysOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysOrganizationServiceBase
      */
-    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().get(`/sysorganizations/${context.sysorganization}/select`,isloading);
-            
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/sysorganizations/${context.sysorganization}/checkkey`,data,isloading);
             return res;
     }
 
@@ -80,7 +79,7 @@ export default class SysOrganizationServiceBase extends EntityService {
     }
 
     /**
-     * Update接口方法
+     * Get接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -88,30 +87,14 @@ export default class SysOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysOrganizationServiceBase
      */
-    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(`/sysorganizations/${context.sysorganization}`,data,isloading);
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/sysorganizations/${context.sysorganization}`,isloading);
             
             return res;
     }
 
     /**
-     * Remove接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof SysOrganizationServiceBase
-     */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().delete(`/sysorganizations/${context.sysorganization}`,isloading);
-            return res;
-    }
-
-    /**
-     * Get接口方法
+     * GetDraft接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -119,14 +102,15 @@ export default class SysOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysOrganizationServiceBase
      */
-    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = await Http.getInstance().get(`/sysorganizations/${context.sysorganization}`,isloading);
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/sysorganizations/getdraft`,isloading);
+        res.data.sysorganization = data.sysorganization;
         
         return res;
     }
 
     /**
-     * GetDraft接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -134,15 +118,13 @@ export default class SysOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysOrganizationServiceBase
      */
-    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await  Http.getInstance().get(`/sysorganizations/getdraft`,isloading);
-        res.data.sysorganization = data.sysorganization;
-        
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/sysorganizations/${context.sysorganization}`,isloading);
             return res;
     }
 
     /**
-     * CheckKey接口方法
+     * Save接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -150,13 +132,16 @@ export default class SysOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysOrganizationServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().post(`/sysorganizations/${context.sysorganization}/checkkey`,data,isloading);
+    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(`/sysorganizations/${context.sysorganization}/save`,data,isloading);
+            
             return res;
     }
 
     /**
-     * Save接口方法
+     * Update接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -164,10 +149,10 @@ export default class SysOrganizationServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysOrganizationServiceBase
      */
-    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 = {};
         Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().post(`/sysorganizations/${context.sysorganization}/save`,data,isloading);
+            let res:any = await  Http.getInstance().put(`/sysorganizations/${context.sysorganization}`,data,isloading);
             
             return res;
     }
@@ -229,4 +214,19 @@ export default class SysOrganizationServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return await Http.getInstance().post(`/sysorganizations/searchtoporg`,tempData,isloading);
     }
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysOrganizationServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/sysorganizations/${context.sysorganization}/select`,isloading);
+            
+            return res;
+    }
 }
\ No newline at end of file

app_web/src/service/sys-post/sys-post-service-base.ts

@@ -39,7 +39,7 @@ export default class SysPostServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * Select接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -47,9 +47,8 @@ export default class SysPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysPostServiceBase
      */
-    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().get(`/sysposts/${context.syspost}/select`,isloading);
-            
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/sysposts/${context.syspost}/checkkey`,data,isloading);
             return res;
     }
 
@@ -78,7 +77,7 @@ export default class SysPostServiceBase extends EntityService {
     }
 
     /**
-     * Update接口方法
+     * Get接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -86,30 +85,14 @@ export default class SysPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysPostServiceBase
      */
-    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(`/sysposts/${context.syspost}`,data,isloading);
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/sysposts/${context.syspost}`,isloading);
             
             return res;
     }
 
     /**
-     * Remove接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof SysPostServiceBase
-     */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().delete(`/sysposts/${context.syspost}`,isloading);
-            return res;
-    }
-
-    /**
-     * Get接口方法
+     * GetDraft接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -117,14 +100,15 @@ export default class SysPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysPostServiceBase
      */
-    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = await Http.getInstance().get(`/sysposts/${context.syspost}`,isloading);
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/sysposts/getdraft`,isloading);
+        res.data.syspost = data.syspost;
         
         return res;
     }
 
     /**
-     * GetDraft接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -132,15 +116,13 @@ export default class SysPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysPostServiceBase
      */
-    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await  Http.getInstance().get(`/sysposts/getdraft`,isloading);
-        res.data.syspost = data.syspost;
-        
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/sysposts/${context.syspost}`,isloading);
             return res;
     }
 
     /**
-     * CheckKey接口方法
+     * Save接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -148,13 +130,16 @@ export default class SysPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysPostServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().post(`/sysposts/${context.syspost}/checkkey`,data,isloading);
+    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(`/sysposts/${context.syspost}/save`,data,isloading);
+            
             return res;
     }
 
     /**
-     * Save接口方法
+     * Update接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -162,10 +147,10 @@ export default class SysPostServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysPostServiceBase
      */
-    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 = {};
         Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().post(`/sysposts/${context.syspost}/save`,data,isloading);
+            let res:any = await  Http.getInstance().put(`/sysposts/${context.syspost}`,data,isloading);
             
             return res;
     }
@@ -198,4 +183,19 @@ export default class SysPostServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return await Http.getInstance().post(`/sysposts/searchdefault`,tempData,isloading);
     }
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysPostServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/sysposts/${context.syspost}/select`,isloading);
+            
+            return res;
+    }
 }
\ No newline at end of file

app_web/src/service/sys-team/sys-team-service-base.ts

@@ -39,7 +39,7 @@ export default class SysTeamServiceBase extends EntityService {
 // 实体接口
 
     /**
-     * Select接口方法
+     * CheckKey接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -47,9 +47,8 @@ export default class SysTeamServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysTeamServiceBase
      */
-    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().get(`/systeams/${context.systeam}/select`,isloading);
-            
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/systeams/${context.systeam}/checkkey`,data,isloading);
             return res;
     }
 
@@ -79,7 +78,7 @@ export default class SysTeamServiceBase extends EntityService {
     }
 
     /**
-     * Update接口方法
+     * Get接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -87,30 +86,14 @@ export default class SysTeamServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysTeamServiceBase
      */
-    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(`/systeams/${context.systeam}`,data,isloading);
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/systeams/${context.systeam}`,isloading);
             
             return res;
     }
 
     /**
-     * Remove接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof SysTeamServiceBase
-     */
-    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().delete(`/systeams/${context.systeam}`,isloading);
-            return res;
-    }
-
-    /**
-     * Get接口方法
+     * GetDraft接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -118,14 +101,15 @@ export default class SysTeamServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysTeamServiceBase
      */
-    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = await Http.getInstance().get(`/systeams/${context.systeam}`,isloading);
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/systeams/getdraft`,isloading);
+        res.data.systeam = data.systeam;
         
         return res;
     }
 
     /**
-     * GetDraft接口方法
+     * Remove接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -133,15 +117,13 @@ export default class SysTeamServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysTeamServiceBase
      */
-    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let res:any = await  Http.getInstance().get(`/systeams/getdraft`,isloading);
-        res.data.systeam = data.systeam;
-        
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/systeams/${context.systeam}`,isloading);
             return res;
     }
 
     /**
-     * CheckKey接口方法
+     * Save接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -149,13 +131,16 @@ export default class SysTeamServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysTeamServiceBase
      */
-    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().post(`/systeams/${context.systeam}/checkkey`,data,isloading);
+    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(`/systeams/${context.systeam}/save`,data,isloading);
+            
             return res;
     }
 
     /**
-     * Save接口方法
+     * Update接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
@@ -163,10 +148,10 @@ export default class SysTeamServiceBase extends EntityService {
      * @returns {Promise<any>}
      * @memberof SysTeamServiceBase
      */
-    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 = {};
         Object.assign(data,masterData);
-            let res:any = await  Http.getInstance().post(`/systeams/${context.systeam}/save`,data,isloading);
+            let res:any = await  Http.getInstance().put(`/systeams/${context.systeam}`,data,isloading);
             
             return res;
     }
@@ -199,4 +184,19 @@ export default class SysTeamServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return await Http.getInstance().post(`/systeams/searchdefault`,tempData,isloading);
     }
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysTeamServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/systeams/${context.systeam}/select`,isloading);
+            
+            return res;
+    }
 }
\ No newline at end of file

app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue

@@ -23,7 +23,7 @@
                             <template v-else>
                                 <i class='fa fa-cogs app-menu-icon'></i>
                             </template>
-                            <span class='text' :title="$t('app.menus.ouindexview.' + item0.name)">{{$t('app.menus.ouindexview.' + item0.name)}}</span>
+                            <span class='text' :title="$t('app.menus.ouindexview.' + item0.name.toLowerCase())">{{$t('app.menus.ouindexview.' + item0.name.toLowerCase())}}</span>
                         </template>
                         <template v-for="item1 in item0.items">
                             <template v-if="item1.items && Array.isArray(item1.items) && item1.items.length > 0">
@@ -35,7 +35,7 @@
                                         <template v-else-if="item1.iconcls && item1.iconcls != ''">
                                             <i :class="[item1.iconcls, 'app-menu-icon']"></i>
                                         </template>
-                                        <span class='text' :title="$t('app.menus.ouindexview.' + item1.name)">{{$t('app.menus.ouindexview.' + item1.name)}}</span>
+                                        <span class='text' :title="$t('app.menus.ouindexview.' + item1.name.toLowerCase())">{{$t('app.menus.ouindexview.' + item1.name.toLowerCase())}}</span>
                                     </template>
                                     <template v-for="item2 in item1.items">
                                         <template v-if="item2.type =='MENUITEM'">
@@ -47,7 +47,7 @@
                                                     <i :class="[item2.iconcls, 'app-menu-icon']"></i>
                                                 </template>
                                                 <template slot="title">
-                                                    <span class="text" :title="$t('app.menus.ouindexview.' + item2.name)">{{$t('app.menus.ouindexview.' + item2.name)}}</span>
+                                                    <span class="text" :title="$t('app.menus.ouindexview.' + item2.name.toLowerCase())">{{$t('app.menus.ouindexview.' + item2.name.toLowerCase())}}</span>
                                                     <template v-if="counterdata && counterdata[item2.counterid] && counterdata[item2.counterid] > 0">
                                                         <span class="pull-right">
                                                             <badge :count="counterdata[item2.counterid]" :overflow-count="9999"></badge>
@@ -69,7 +69,7 @@
                                             <i :class="[item1.iconcls, 'app-menu-icon']"></i>
                                         </template>
                                         <template slot="title">
-                                            <span class="text" :title="$t('app.menus.ouindexview.' + item1.name)">{{$t('app.menus.ouindexview.' + item1.name)}} </span>
+                                            <span class="text" :title="$t('app.menus.ouindexview.' + item1.name.toLowerCase())">{{$t('app.menus.ouindexview.' + item1.name.toLowerCase())}} </span>
                                             <template v-if="counterdata && counterdata[item1.counterid] && counterdata[item1.counterid] > 0">
                                                 <span class="pull-right">
                                                     <badge :count="counterdata[item1.counterid]" :overflow-count="9999"></badge>
@@ -95,7 +95,7 @@
                                 <i class='fa fa-cogs app-menu-icon'></i>
                             </template>
                             <template slot="title">
-                                <span class="text" :title="$t('app.menus.ouindexview.' + item0.name)">{{$t('app.menus.ouindexview.' + item0.name)}}</span>
+                                <span class="text" :title="$t('app.menus.ouindexview.' + item0.name.toLowerCase())">{{$t('app.menus.ouindexview.' + item0.name.toLowerCase())}}</span>
                                 <template v-if="counterdata && counterdata[item0.counterid] && counterdata[item0.counterid] > 0">
                                     <span class="pull-right">
                                         <badge :count="counterdata[item0.counterid]" :overflow-count="9999"></badge>

app_web/src/widgets/sys-department/default-searchform/default-searchform-base.vue

@@ -786,8 +786,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

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

@@ -1076,8 +1076,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1127,7 +1127,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1212,7 +1212,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1333,6 +1333,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2227,8 +2230,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/sys-department/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -479,7 +479,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
             this.split = this.$store.getters.getViewSplit(this.viewUID);
         }else{
             let containerWidth:number = (document.getElementById("treeexpviewtreeexpbar") as any).offsetWidth;
-            if(this.ctrlWidth){
+            if(this.ctrlWidth && containerWidth != 0){
                     this.split = this.ctrlWidth/containerWidth;
             }
             this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split}); 

app_web/src/widgets/sys-dept-member/main-grid/main-grid-base.vue

@@ -1073,8 +1073,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1124,7 +1124,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1209,7 +1209,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1330,6 +1330,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2200,8 +2203,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/sys-employee/default-searchform/default-searchform-base.vue

@@ -742,8 +742,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

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

@@ -1001,8 +1001,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1052,7 +1052,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1137,7 +1137,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1258,6 +1258,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2151,8 +2154,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/sys-organization/default-searchform/default-searchform-base.vue

@@ -756,8 +756,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

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

@@ -992,8 +992,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1043,7 +1043,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1128,7 +1128,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1249,6 +1249,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2137,8 +2140,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/sys-organization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -479,7 +479,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
             this.split = this.$store.getters.getViewSplit(this.viewUID);
         }else{
             let containerWidth:number = (document.getElementById("treeexpviewtreeexpbar") as any).offsetWidth;
-            if(this.ctrlWidth){
+            if(this.ctrlWidth && containerWidth != 0){
                     this.split = this.ctrlWidth/containerWidth;
             }
             this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split}); 

app_web/src/widgets/sys-post/default-searchform/default-searchform-base.vue

@@ -634,8 +634,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

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

@@ -845,8 +845,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -896,7 +896,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -981,7 +981,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1102,6 +1102,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -1963,8 +1966,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/sys-team-member/main-grid/main-grid-base.vue

@@ -997,8 +997,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -1048,7 +1048,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -1133,7 +1133,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1254,6 +1254,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -2121,8 +2124,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

app_web/src/widgets/sys-team/default-searchform/default-searchform-base.vue

@@ -634,8 +634,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

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

@@ -824,8 +824,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
@@ -875,7 +875,7 @@ export default class MainBase extends Vue implements ControlInterface {
             if (response && response.status === 401) {
                 return;
             }
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
         });
     }
 
@@ -960,7 +960,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     resolve(response);
                 }).catch((response: any) => {
                     if (response && response.status != 200) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1081,6 +1081,9 @@ export default class MainBase extends Vue implements ControlInterface {
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
         const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
@@ -1939,8 +1942,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.errorMessage });
+                if (response.data && response.data.message) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }

ibzou-app/ibzou-app-web/pom.xml

@@ -77,6 +77,32 @@
                                     <workingDirectory>../../app_web</workingDirectory>
                                 </configuration>
                             </execution>
+                            <execution>      
+                                <id>prepare</id>                                                           
+                                <configuration>
+                                    <executable>cp</executable>
+                                    <arguments>
+                                        <argument>../../${project.artifactId}.jar</argument>
+                                        <argument>${project.basedir}/src/main/docker/</argument>
+                                    </arguments>
+                                </configuration> 
+                            </execution> 
+                            <execution>    
+                                <id>buildpush</id>                                                                         
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>buildx</argument>
+                                        <argument>build</argument>
+                                        <argument>--platform</argument>
+                                        <argument>linux/amd64,linux/arm64</argument>
+                                        <argument>-t</argument>
+                                        <argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
+                                        <argument>${project.basedir}/src/main/docker</argument>
+                                        <argument>--push</argument>
+                                    </arguments>                                    
+                                </configuration>
+                            </execution>    
                         </executions>
                     </plugin>
 

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

 
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk/openjdk8:jdk8u242-b08-centos
 
 ENV TZ=Asia/Shanghai \
     SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

@@ -7,6 +7,22 @@ logging:
 #zuul网关路由设置
 zuul:
   routes:
+    loginv7:
+      path: /v7/login
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    changepwd:
+      path: /v7/changepwd
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    uaa:
+      path: /uaa/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    config:
+      path: /configs/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
     sys_post:
       path: /sysposts/**
       serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
@@ -35,21 +51,5 @@ zuul:
       path: /sysdeptmembers/**
       serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
       stripPrefix: false
-    loginv7:
-      path: /v7/login
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    changepwd:
-      path: /v7/changepwd
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    uaa:
-      path: /uaa/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
-    config:
-      path: /configs/**
-      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDepartment.java

@@ -74,7 +74,7 @@ public class SysDepartment extends EntityMP implements Serializable {
     /**
      * 单位
      */
-    @DEField(preType = DEPredefinedFieldType.ORGID)
+    @DEField(name = "orgid", preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "orgid")
     @JSONField(name = "orgid")
     @JsonProperty("orgid")

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysEmployee.java

@@ -162,7 +162,7 @@ public class SysEmployee extends EntityMP implements Serializable {
     /**
      * 单位
      */
-    @DEField(preType = DEPredefinedFieldType.ORGID)
+    @DEField(name = "orgid", preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "orgid")
     @JSONField(name = "orgid")
     @JsonProperty("orgid")

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/SysDepartmentMapper.java

@@ -31,7 +31,7 @@ public interface SysDepartmentMapper extends BaseMapper<SysDepartment> {
     @CacheEvict(value ="sysdepartment", key = "'row:'+#p0.deptid")
     int updateById(@Param(Constants.ENTITY) SysDepartment entity);
     @Override
-    @CacheEvict(value ="sysdepartment", key = "'row:'+#p0.deptid")
+    @CacheEvict(value ="sysdepartment", key = "'row:'+#p0.deptid" ,condition ="#p0 != null")
     int update(@Param(Constants.ENTITY) SysDepartment entity, @Param("ew") Wrapper<SysDepartment> updateWrapper);
     @Override
     @CacheEvict(value ="sysdepartment", key = "'row:'+#p0")

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/SysEmployeeMapper.java

@@ -31,7 +31,7 @@ public interface SysEmployeeMapper extends BaseMapper<SysEmployee> {
     @CacheEvict(value ="sysemployee", key = "'row:'+#p0.userid")
     int updateById(@Param(Constants.ENTITY) SysEmployee entity);
     @Override
-    @CacheEvict(value ="sysemployee", key = "'row:'+#p0.userid")
+    @CacheEvict(value ="sysemployee", key = "'row:'+#p0.userid" ,condition ="#p0 != null")
     int update(@Param(Constants.ENTITY) SysEmployee entity, @Param("ew") Wrapper<SysEmployee> updateWrapper);
     @Override
     @CacheEvict(value ="sysemployee", key = "'row:'+#p0")

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/SysOrganizationMapper.java

@@ -32,7 +32,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     @CacheEvict(value ="sysorganization", key = "'row:'+#p0.orgid")
     int updateById(@Param(Constants.ENTITY) SysOrganization entity);
     @Override
-    @CacheEvict(value ="sysorganization", key = "'row:'+#p0.orgid")
+    @CacheEvict(value ="sysorganization", key = "'row:'+#p0.orgid" ,condition ="#p0 != null")
     int update(@Param(Constants.ENTITY) SysOrganization entity, @Param("ew") Wrapper<SysOrganization> updateWrapper);
     @Override
     @CacheEvict(value ="sysorganization", key = "'row:'+#p0")

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

@@ -45,12 +45,16 @@ public interface ISysEmployeeService extends IService<SysEmployee> {
     void saveBatch(List<SysEmployee> list);
     Page<SysEmployee> searchDefault(SysEmployeeSearchContext context);
     List<SysEmployee> selectByMdeptid(String deptid);
+    @CacheEvict(value = "sysemployee", allEntries = true)
     void resetByMdeptid(String deptid);
+    @CacheEvict(value = "sysemployee", allEntries = true)
     void resetByMdeptid(Collection<String> ids);
     @CacheEvict(value = "sysemployee", allEntries = true)
     void removeByMdeptid(String deptid);
     List<SysEmployee> selectByOrgid(String orgid);
+    @CacheEvict(value = "sysemployee", allEntries = true)
     void resetByOrgid(String orgid);
+    @CacheEvict(value = "sysemployee", allEntries = true)
     void resetByOrgid(Collection<String> ids);
     @CacheEvict(value = "sysemployee", allEntries = true)
     void removeByOrgid(String orgid);

ibzou-core/src/main/java/cn/ibizlab/core/util/config/CommonAutoConfig.java

+package cn.ibizlab.core.util.config;
+
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+/**
+ * 通用配置类
+ */
+@Configuration
+public class CommonAutoConfig {
+
+    @Value("${jbpm.enable.multi.con:true}")
+    private  String flag;
+
+    /**
+     * 处理逻辑节点支持多来源配置
+     */
+    @Component
+    public class InstallSystemParamsCommandLineRunner implements CommandLineRunner {
+
+        @Override
+        public void run(String... var1){
+            System.setProperty("jbpm.enable.multi.con", flag);
+        }
+    }
+}

ibzou-provider/ibzou-provider-api/pom.xml

@@ -74,6 +74,40 @@
                             </resources>
                             </configuration>
                     </plugin>   
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId> 
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>3.0.0</version>          
+                        <executions> 
+                            <execution>      
+                                <id>prepare</id>                                                           
+                                <configuration>
+                                    <executable>cp</executable>
+                                    <arguments>
+                                        <argument>../../${project.artifactId}.jar</argument>
+                                        <argument>${project.basedir}/src/main/docker/</argument>
+                                    </arguments>
+                                </configuration> 
+                            </execution> 
+                            <execution>    
+                                <id>buildpush</id>                                                                         
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>buildx</argument>
+                                        <argument>build</argument>
+                                        <argument>--platform</argument>
+                                        <argument>linux/amd64,linux/arm64</argument>
+                                        <argument>-t</argument>
+                                        <argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
+                                        <argument>${project.basedir}/src/main/docker</argument>
+                                        <argument>--push</argument>
+                                    </arguments>                                    
+                                </configuration>
+                            </execution>                             
+                        </executions>                              
+                    </plugin>                                          
                 </plugins>
             </build>
         </profile>

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

 
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk/openjdk8:jdk8u242-b08-centos
 
 ENV TZ=Asia/Shanghai \
     SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \