Miracle 部署微服务应用

app_PIM/public/assets/json/view-config.json

@@ -139,16 +139,6 @@
         "viewtag": "0dbdd98c4946bd6e79feb18e32dd387b",
         "memo": ""
     },
-    "hrtransferapplywfdynaexpgridview": {
-        "title": "调动申请工作流导航表格视图",
-        "caption": "调动申请",
-        "viewtype": "DEWFDYNAEXPGRIDVIEW",
-        "viewmodule": "Pcm",
-        "viewname": "HRTransferApplyWFDynaExpGridView",
-        "viewfilename": "hrtransfer-apply-wfdyna-exp-grid-view",
-        "viewtag": "10c50502a4eebb3c2f6373326db96fc5",
-        "memo": ""
-    },
     "hromhierarchycatgridview": {
         "title": "组织层次结构",
         "caption": "结构层次类别",
@@ -1059,16 +1049,6 @@
         "viewtag": "c62ff001669cca98c0a2a7bc3383c775",
         "memo": ""
     },
-    "hrtransferapplywfdynaeditview": {
-        "title": "调动申请",
-        "caption": "调动申请",
-        "viewtype": "DEWFDYNAEDITVIEW",
-        "viewmodule": "Pcm",
-        "viewname": "HRTransferApplyWFDynaEditView",
-        "viewfilename": "hrtransfer-apply-wfdyna-edit-view",
-        "viewtag": "c8310acd7e65d023051725aac59122d9",
-        "memo": ""
-    },
     "hremployeedashboardview": {
         "title": "员工看板",
         "caption": "员工看板",

app_PIM/src/locale/lang/en-US.ts

@@ -169,7 +169,6 @@ export default {
                 menuitem12: "职务",
                 menuitem13: "调动",
                 menuitem14: "调动申请",
-                menuitem16: "调动管理",
                 bottom_exp: "底部内容",
                 footer_left: "底部左侧",
                 footer_center: "底部中间",

app_PIM/src/locale/lang/zh-CN.ts

@@ -169,7 +169,6 @@ export default {
                 menuitem12: "职务",
                 menuitem13: "调动",
                 menuitem14: "调动申请",
-                menuitem16: "调动管理",
                 bottom_exp: "底部内容",
                 footer_left: "底部左侧",
                 footer_center: "底部中间",

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts

@@ -35,10 +35,6 @@ export default {
 			caption: "调动申请",
       		title: "调动编辑",
 		},
-		wfdynaexpgridview: {
-			caption: "调动申请",
-      		title: "调动申请工作流导航表格视图",
-		},
 		v_001: {
 			caption: "调动申请",
       		title: "拟稿",
@@ -71,10 +67,6 @@ export default {
 			caption: "调动申请",
       		title: "调动申请数据选择视图",
 		},
-		wfdynaeditview: {
-			caption: "调动申请",
-      		title: "调动申请",
-		},
 		dashboardview: {
 			caption: "调动看板",
       		title: "调动看板",
@@ -259,10 +251,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	wfdynaexpgridviewtoolbar_toolbar: {
-	},
-	wfdynaeditviewtoolbar_toolbar: {
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "New",

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts

@@ -34,10 +34,6 @@ export default {
 			caption: "调动申请",
       		title: "调动编辑",
 		},
-		wfdynaexpgridview: {
-			caption: "调动申请",
-      		title: "调动申请工作流导航表格视图",
-		},
 		v_001: {
 			caption: "调动申请",
       		title: "拟稿",
@@ -70,10 +66,6 @@ export default {
 			caption: "调动申请",
       		title: "调动申请数据选择视图",
 		},
-		wfdynaeditview: {
-			caption: "调动申请",
-      		title: "调动申请",
-		},
 		dashboardview: {
 			caption: "调动看板",
       		title: "调动看板",
@@ -258,10 +250,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	wfdynaexpgridviewtoolbar_toolbar: {
-	},
-	wfdynaeditviewtoolbar_toolbar: {
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",

app_PIM/src/mock/app/pim-appmenu/pim-appmenu.ts

@@ -155,7 +155,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 	iconcls: 'fa fa-th-large',
 	icon: '',
 	textcls: '',
-	appfunctag: '_9',
+	appfunctag: '_8',
 	resourcetag: '',
 },
 	],
@@ -229,7 +229,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 	iconcls: 'fa fa-signal',
 	icon: '',
 	textcls: '',
-	appfunctag: '_11',
+	appfunctag: '_10',
 	resourcetag: '',
 },
 		{
@@ -247,7 +247,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 	iconcls: 'fa fa-sitemap',
 	icon: '',
 	textcls: '',
-	appfunctag: '_10',
+	appfunctag: '_9',
 	resourcetag: '',
 },
 	],
@@ -341,25 +341,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 	iconcls: 'fa fa-cube',
 	icon: '',
 	textcls: '',
-	appfunctag: '_12',
-	resourcetag: '',
-},
-		{
-	id: 'B6804D4E-5551-4429-9790-40943E85551C',
-	name: 'menuitem16',
-	text: '调动管理',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '调动管理',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-folder-open-o',
-	icon: '',
-	textcls: '',
-	appfunctag: '_7',
+	appfunctag: '_11',
 	resourcetag: '',
 },
 	],

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -119,14 +119,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HRTransferApplyEditView",
             "viewtag": "0dbdd98c4946bd6e79feb18e32dd387b"
         },
-        "hrtransferapplywfdynaexpgridview": {
-            "title": "调动申请工作流导航表格视图",
-            "caption": "调动申请",
-            "viewtype": "DEWFDYNAEXPGRIDVIEW",
-            "viewmodule": "Pcm",
-            "viewname": "HRTransferApplyWFDynaExpGridView",
-            "viewtag": "10c50502a4eebb3c2f6373326db96fc5"
-        },
         "hromhierarchycatgridview": {
             "title": "组织层次结构",
             "caption": "结构层次类别",
@@ -855,14 +847,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HROMHierarchyCatDashboardView",
             "viewtag": "c62ff001669cca98c0a2a7bc3383c775"
         },
-        "hrtransferapplywfdynaeditview": {
-            "title": "调动申请",
-            "caption": "调动申请",
-            "viewtype": "DEWFDYNAEDITVIEW",
-            "viewmodule": "Pcm",
-            "viewname": "HRTransferApplyWFDynaEditView",
-            "viewtag": "c8310acd7e65d023051725aac59122d9"
-        },
         "hremployeedashboardview": {
             "title": "员工看板",
             "caption": "员工看板",

app_PIM/src/pages/ungroup/pim/page-register.ts

@@ -15,8 +15,8 @@ export const PageComponents = {
         Vue.component('hremployee-pickup-grid-view', () => import('@pages/human-resource/hremployee-pickup-grid-view/hremployee-pickup-grid-view.vue'));
         Vue.component('hrcontract-grid-view', () => import('@pages/human-resource/hrcontract-grid-view/hrcontract-grid-view.vue'));
         Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
-        Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
         Vue.component('hrpost-v-006', () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'));
+        Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
         Vue.component('hrlegal-v-002', () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'));
         Vue.component('hrcontract-tab-exp-view', () => import('@pages/human-resource/hrcontract-tab-exp-view/hrcontract-tab-exp-view.vue'));
         Vue.component('hremployee-v-003', () => import('@pages/human-resource/hremployee-v-003/hremployee-v-003.vue'));
@@ -31,7 +31,6 @@ export const PageComponents = {
         Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
         Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
         Vue.component('hrpost-rel-v-001', () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'));
-        Vue.component('hrtransfer-apply-wfdyna-edit-view', () => import('@pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue'));
         Vue.component('hrtransfer-apply-v-002', () => import('@pages/pcm/hrtransfer-apply-v-002/hrtransfer-apply-v-002.vue'));
         Vue.component('hrresearch-grid-view', () => import('@pages/human-resource/hrresearch-grid-view/hrresearch-grid-view.vue'));
         Vue.component('hrpost-v-003', () => import('@pages/human-resource/hrpost-v-003/hrpost-v-003.vue'));
@@ -47,7 +46,6 @@ export const PageComponents = {
         Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
         Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
         Vue.component('hrduty-pickup-view', () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'));
-        Vue.component('hrtransfer-apply-wfdyna-exp-grid-view', () => import('@pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.vue'));
         Vue.component('hremployee-v-006', () => import('@pages/human-resource/hremployee-v-006/hremployee-v-006.vue'));
         Vue.component('hremployee-v-002', () => import('@pages/human-resource/hremployee-v-002/hremployee-v-002.vue'));
         Vue.component('hremployee-edit-view', () => import('@pages/human-resource/hremployee-edit-view/hremployee-edit-view.vue'));
@@ -59,8 +57,8 @@ export const PageComponents = {
         Vue.component('hremployee-pickup-view', () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'));
         Vue.component('hrtransfer-apply-v-005', () => import('@pages/pcm/hrtransfer-apply-v-005/hrtransfer-apply-v-005.vue'));
         Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
-        Vue.component('hrwork-record-edit-view', () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'));
         Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
+        Vue.component('hrwork-record-edit-view', () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'));
         Vue.component('hremployee-v-004', () => import('@pages/human-resource/hremployee-v-004/hremployee-v-004.vue'));
         Vue.component('hrpost-v-002', () => import('@pages/human-resource/hrpost-v-002/hrpost-v-002.vue'));
         Vue.component('hremployee-v-005', () => import('@pages/human-resource/hremployee-v-005/hremployee-v-005.vue'));

app_PIM/src/store/modules/view-action/state.ts

@@ -145,17 +145,6 @@ export const viewstate: any = {
                 'e7ba37699bd458dc8dd5c02abac8dadd',
             ],
         },
-        {
-            viewtag: '10c50502a4eebb3c2f6373326db96fc5',
-            viewmodule: 'Pcm',
-            viewname: 'HRTransferApplyWFDynaExpGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'c8310acd7e65d023051725aac59122d9',
-                '0dbdd98c4946bd6e79feb18e32dd387b',
-            ],
-        },
         {
             viewtag: '114f056047eddd92374e982356e59852',
             viewmodule: 'Base',
@@ -376,7 +365,6 @@ export const viewstate: any = {
                 '997c27311a28f6ed4e41153c43a5f723',
                 'bae1de77dc5bd2584e2dcf7201a06495',
                 '0d8ac739134947cc5f6545d4041024de',
-                '10c50502a4eebb3c2f6373326db96fc5',
                 'b9130f18de0b66cd31ecaddb5a841aae',
                 '41036146909ab3f28ff59b80370514b2',
                 '114f056047eddd92374e982356e59852',
@@ -1029,18 +1017,6 @@ export const viewstate: any = {
                 '1316a3add8f01af03edf978ef21af6b1',
             ],
         },
-        {
-            viewtag: 'c8310acd7e65d023051725aac59122d9',
-            viewmodule: 'Pcm',
-            viewname: 'HRTransferApplyWFDynaEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '04c02737ae62a4f4c014607441ee0401',
-                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
-                'e7ba37699bd458dc8dd5c02abac8dadd',
-            ],
-        },
         {
             viewtag: 'cb76a18e2c82d318acd00a4ae7c63e8f',
             viewmodule: 'HumanResource',

app_PIM/src/uiservice/hrtransfer-apply/hrtransfer-apply-ui-service-base.ts

@@ -91,7 +91,6 @@ export default class HRTransferApplyUIServiceBase extends UIService {
     public initViewMap(){
         this.allViewMap.set(':',{viewname:'v_002',srfappde:'hrtransferapplies'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrtransferapplies'});
-        this.allViewMap.set(':',{viewname:'wfdynaexpgridview',srfappde:'hrtransferapplies'});
         this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrtransferapplies'});
         this.allViewMap.set(':',{viewname:'v_004',srfappde:'hrtransferapplies'});
         this.allViewMap.set(':',{viewname:'tabexpview',srfappde:'hrtransferapplies'});
@@ -100,7 +99,6 @@ export default class HRTransferApplyUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'v_006',srfappde:'hrtransferapplies'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrtransferapplies'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'hrtransferapplies'});
-        this.allViewMap.set(':',{viewname:'wfdynaeditview',srfappde:'hrtransferapplies'});
         this.allViewMap.set(':',{viewname:'dashboardview',srfappde:'hrtransferapplies'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hrtransferapplies'});
     }

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-base.tsx

@@ -15,26 +15,24 @@ export class PIMBase extends Vue {
         if (item) {
             let judge = true;
             switch (item.appfunctag) {
-                case '_10': 
-                    this.click_10(item); break;
+                case '_9': 
+                    this.click_9(item); break;
                 case '_3': 
                     this.click_3(item); break;
                 case '_2': 
                     this.click_2(item); break;
-                case '_7': 
-                    this.click_7(item); break;
                 case '_4': 
                     this.click_4(item); break;
                 case '_6': 
                     this.click_6(item); break;
-                case '_11': 
-                    this.click_11(item); break;
-                case '_9': 
-                    this.click_9(item); break;
+                case '_10': 
+                    this.click_10(item); break;
+                case '_8': 
+                    this.click_8(item); break;
                 case '_5': 
                     this.click_5(item); break;
-                case '_12': 
-                    this.click_12(item); break;
+                case '_11': 
+                    this.click_11(item); break;
                 default:
                     judge = false;
                     console.warn('未指定应用功能');
@@ -51,7 +49,7 @@ export class PIMBase extends Vue {
      * @param {*} [item={}]
      * @memberof PIM
      */
-    public click_10(item: any = {}) {
+    public click_9(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
@@ -114,29 +112,6 @@ export class PIMBase extends Vue {
         })
     }
     
-    /**
-     * 调动管理
-     *
-     * @param {*} [item={}]
-     * @memberof PIM
-     */
-    public click_7(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
-            { pathName: 'wfdynaexpgridview', parameterName: 'wfdynaexpgridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
-    
     /**
      * 员工信息
      *
@@ -189,7 +164,7 @@ export class PIMBase extends Vue {
      * @param {*} [item={}]
      * @memberof PIM
      */
-    public click_11(item: any = {}) {
+    public click_10(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
@@ -212,7 +187,7 @@ export class PIMBase extends Vue {
      * @param {*} [item={}]
      * @memberof PIM
      */
-    public click_9(item: any = {}) {
+    public click_8(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
@@ -258,7 +233,7 @@ export class PIMBase extends Vue {
      * @param {*} [item={}]
      * @memberof PIM
      */
-    public click_12(item: any = {}) {
+    public click_11(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts

@@ -168,7 +168,7 @@ export default class PIMModel {
                         	iconcls: 'fa fa-th-large',
                         	icon: '',
                         	textcls: '',
-                        	appfunctag: '_9',
+                        	appfunctag: '_8',
                         	appfuncyype: 'APPVIEW',
                         	viewname: 'hrcontract-tab-exp-view',
                         	resourcetag: '',
@@ -252,7 +252,7 @@ export default class PIMModel {
                         	iconcls: 'fa fa-signal',
                         	icon: '',
                         	textcls: '',
-                        	appfunctag: '_11',
+                        	appfunctag: '_10',
                         	appfuncyype: 'APPVIEW',
                         	viewname: 'hromhierarchy-cat-grid-view',
                         	resourcetag: '',
@@ -273,7 +273,7 @@ export default class PIMModel {
                         	iconcls: 'fa fa-sitemap',
                         	icon: '',
                         	textcls: '',
-                        	appfunctag: '_10',
+                        	appfunctag: '_9',
                         	appfuncyype: 'APPVIEW',
                         	viewname: 'hrorganization-grid-view',
                         	resourcetag: '',
@@ -378,32 +378,11 @@ export default class PIMModel {
                         	iconcls: 'fa fa-cube',
                         	icon: '',
                         	textcls: '',
-                        	appfunctag: '_12',
+                        	appfunctag: '_11',
                         	appfuncyype: 'APPVIEW',
                         	viewname: 'hrtransfer-apply-tab-exp-view',
                         	resourcetag: '',
                         }
-                        ,
-                        		        {
-                        	id: 'B6804D4E-5551-4429-9790-40943E85551C',
-                        	name: 'menuitem16',
-                        	text: '调动管理',
-                        	type: 'MENUITEM',
-                        	counterid: '',
-                        	tooltip: '调动管理',
-                        	expanded: false,
-                        	separator: false,
-                        	hidden: false,
-                        	hidesidebar: false,
-                        	opendefault: false,
-                        	iconcls: 'fa fa-folder-open-o',
-                        	icon: '',
-                        	textcls: '',
-                        	appfunctag: '_7',
-                        	appfuncyype: 'APPVIEW',
-                        	viewname: 'hrtransfer-apply-wfdyna-exp-grid-view',
-                        	resourcetag: '',
-                        }
                         ,
                 	],
                 }
@@ -498,7 +477,7 @@ export default class PIMModel {
 	 */
 	private funcs: any[] = [
         {
-            appfunctag: '_10',
+            appfunctag: '_9',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'hrorganizationgridview',
@@ -533,18 +512,6 @@ export default class PIMModel {
                 { pathName: 'gridview', parameterName: 'gridview' },
             ],
         },
-        {
-            appfunctag: '_7',
-            appfuncyype: 'APPVIEW',
-            openmode: '',
-            codename: 'hrtransferapplywfdynaexpgridview',
-            deResParameters: [],
-            routepath: '/pim/:pim?/hrtransferapplies/:hrtransferapply?/wfdynaexpgridview/:wfdynaexpgridview?',
-            parameters: [
-                { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
-                { pathName: 'wfdynaexpgridview', parameterName: 'wfdynaexpgridview' },
-            ],
-        },
         {
             appfunctag: '_4',
             appfuncyype: 'APPVIEW',
@@ -570,7 +537,7 @@ export default class PIMModel {
             ],
         },
         {
-            appfunctag: '_11',
+            appfunctag: '_10',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'hromhierarchycatgridview',
@@ -582,7 +549,7 @@ export default class PIMModel {
             ],
         },
         {
-            appfunctag: '_9',
+            appfunctag: '_8',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'hrcontracttabexpview',
@@ -606,7 +573,7 @@ export default class PIMModel {
             ],
         },
         {
-            appfunctag: '_12',
+            appfunctag: '_11',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'hrtransferapplytabexpview',

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

@@ -994,7 +994,7 @@
 
 
     <!--输出实体[HRTRANSFERAPPLY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-144-33">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-146-33">
         <createTable tableName="T_HRTRANSFERAPPLY">
                 <column name="HRTRANSFERAPPLYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRTRANSFERAPPLY_HRTRANSFERA"/>
@@ -1203,13 +1203,13 @@
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRAININGRECORD" constraintName="DER1N_HRTRAININGRECORD_HREMPLO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRTRANSFERAPPLY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-144-69">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-146-69">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HREMPLOY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-144-70">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-146-70">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRORGANI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-144-71">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-146-71">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRPOST_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRWORKRECORD]外键关系 -->

humanresource-core/src/main/resources/permission/systemResource.json

@@ -265,7 +265,7 @@
             {
                "appid":"PIM",
                "appname":"基础管理",
-               "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工" },{ "id":"menuitem8" , "name":"合同" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]},{ "id":"menuitem13" , "name":"调动" , "items":[{ "id":"menuitem14" , "name":"调动申请" },{ "id":"menuitem16" , "name":"调动管理" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
+               "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工" },{ "id":"menuitem8" , "name":"合同" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]},{ "id":"menuitem13" , "name":"调动" , "items":[{ "id":"menuitem14" , "name":"调动申请" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
             }
             ]
     }