jackwang 部署微服务应用

app_PIM/src/pages/base/hrorg-address-grid-view/hrorg-address-grid-view-base.tsx

@@ -564,9 +564,9 @@ export class HROrgAddressGridViewBase extends GridViewBase {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [
@@ -615,9 +615,9 @@ export class HROrgAddressGridViewBase extends GridViewBase {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [

app_PIM/src/pages/base/hrorg-address-v-001/hrorg-address-v-001-base.tsx

@@ -207,9 +207,9 @@ export class HROrgAddressV_001Base extends GridView9Base {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [

app_PIM/src/pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view-base.tsx

@@ -564,9 +564,9 @@ export class HROrgContactGridViewBase extends GridViewBase {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [
@@ -615,9 +615,9 @@ export class HROrgContactGridViewBase extends GridViewBase {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [

app_PIM/src/pages/base/hrorg-contact-v-001/hrorg-contact-v-001-base.tsx

@@ -214,9 +214,9 @@ export class HROrgContactV_001Base extends GridView9Base {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [
@@ -265,9 +265,9 @@ export class HROrgContactV_001Base extends GridView9Base {
             Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(tempContext.hrorganization && true){
+        if(tempContext.hrlegal && true){
             deResParameters = [
-            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            { pathName: 'hrlegals', parameterName: 'hrlegal' },
             ]
         }
         const parameters: any[] = [

app_PIM/src/service/hrlegal/hrlegal-service-base.ts

@@ -73,6 +73,8 @@ export default class HRLegalServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hrlegals`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
         
         return res;
     }

app_PIM/src/service/hroperation-unit/hroperation-unit-service-base.ts

@@ -73,6 +73,8 @@ export default class HROperationUnitServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hroperationunits`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
         
         return res;
     }

app_PIM/src/service/hrorg-address/hrorg-address-service-base.ts

@@ -48,8 +48,13 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgaddress){
-            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
+        if(context.hroperationunit && context.hrorgaddress){
+            let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgaddress){
+            let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
             
             return res;
         }
@@ -68,7 +73,7 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && true){
+        if(context.hroperationunit && true){
             let masterData:any = {};
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -78,7 +83,21 @@ export default class HROrgAddressServiceBase extends EntityService {
                 delete data.srffrontuf;
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses`,data,isloading);
+            let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgaddresses`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgaddresses`,data,isloading);
             
             return res;
         }
@@ -106,10 +125,17 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgaddress){
+        if(context.hroperationunit && context.hrorgaddress){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgaddress){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
+            let res:any = await Http.getInstance().put(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
             
             return res;
         }
@@ -130,8 +156,12 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgaddress){
-            let res:any = Http.getInstance().delete(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,isloading);
+        if(context.hroperationunit && context.hrorgaddress){
+            let res:any = Http.getInstance().delete(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}`,isloading);
+            return res;
+        }
+        if(context.hrlegal && context.hrorgaddress){
+            let res:any = Http.getInstance().delete(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}`,isloading);
             return res;
         }
             let res:any = Http.getInstance().delete(`/hrorgaddresses/${context.hrorgaddress}`,isloading);
@@ -148,8 +178,13 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgaddress){
-            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,isloading);
+        if(context.hroperationunit && context.hrorgaddress){
+            let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}`,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgaddress){
+            let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}`,isloading);
             
             return res;
         }
@@ -168,8 +203,14 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && true){
-            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/getdraft`,isloading);
+        if(context.hroperationunit && true){
+            let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/getdraft`,isloading);
+            res.data.hrorgaddress = data.hrorgaddress;
+            
+            return res;
+        }
+        if(context.hrlegal && true){
+            let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/getdraft`,isloading);
             res.data.hrorgaddress = data.hrorgaddress;
             
             return res;
@@ -190,10 +231,17 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgaddress){
+        if(context.hroperationunit && context.hrorgaddress){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
+            let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgaddress){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
             
             return res;
         }
@@ -211,10 +259,17 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgaddress){
+        if(context.hroperationunit && context.hrorgaddress){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgaddress){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
+            let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
             
             return res;
         }
@@ -235,9 +290,14 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && true){
+        if(context.hroperationunit && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        if(context.hrlegal && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/fetchdefault`,tempData,isloading);
             return res;
         }
         let tempData:any = JSON.parse(JSON.stringify(data));

app_PIM/src/service/hrorg-contact/hrorg-contact-service-base.ts

@@ -48,8 +48,13 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgcontact){
-            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
+        if(context.hroperationunit && context.hrorgcontact){
+            let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgcontact){
+            let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
             
             return res;
         }
@@ -68,7 +73,7 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && true){
+        if(context.hroperationunit && true){
             let masterData:any = {};
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -78,7 +83,21 @@ export default class HROrgContactServiceBase extends EntityService {
                 delete data.srffrontuf;
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts`,data,isloading);
+            let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgcontacts`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgcontacts`,data,isloading);
             
             return res;
         }
@@ -106,10 +125,17 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgcontact){
+        if(context.hroperationunit && context.hrorgcontact){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgcontact){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
+            let res:any = await Http.getInstance().put(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
             
             return res;
         }
@@ -130,8 +156,12 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgcontact){
-            let res:any = Http.getInstance().delete(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,isloading);
+        if(context.hroperationunit && context.hrorgcontact){
+            let res:any = Http.getInstance().delete(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}`,isloading);
+            return res;
+        }
+        if(context.hrlegal && context.hrorgcontact){
+            let res:any = Http.getInstance().delete(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}`,isloading);
             return res;
         }
             let res:any = Http.getInstance().delete(`/hrorgcontacts/${context.hrorgcontact}`,isloading);
@@ -148,8 +178,13 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgcontact){
-            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,isloading);
+        if(context.hroperationunit && context.hrorgcontact){
+            let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}`,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgcontact){
+            let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}`,isloading);
             
             return res;
         }
@@ -168,8 +203,14 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && true){
-            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/getdraft`,isloading);
+        if(context.hroperationunit && true){
+            let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/getdraft`,isloading);
+            res.data.hrorgcontact = data.hrorgcontact;
+            
+            return res;
+        }
+        if(context.hrlegal && true){
+            let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/getdraft`,isloading);
             res.data.hrorgcontact = data.hrorgcontact;
             
             return res;
@@ -190,10 +231,17 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgcontact){
+        if(context.hroperationunit && context.hrorgcontact){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
+            let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgcontact){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
             
             return res;
         }
@@ -211,10 +259,17 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && context.hrorgcontact){
+        if(context.hroperationunit && context.hrorgcontact){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
+            
+            return res;
+        }
+        if(context.hrlegal && context.hrorgcontact){
             let masterData:any = {};
             Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
+            let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
             
             return res;
         }
@@ -235,9 +290,14 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        if(context.hrorganization && true){
+        if(context.hroperationunit && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        if(context.hrlegal && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/fetchdefault`,tempData,isloading);
             return res;
         }
         let tempData:any = JSON.parse(JSON.stringify(data));

app_PIM/src/service/hrorganization/hrorganization-service-base.ts

@@ -73,8 +73,6 @@ export default class HROrganizationServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hrorganizations`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
         
         return res;
     }

app_PIM/src/widgets/hrlegal/if-001-form/if-001-form.html

@@ -112,7 +112,7 @@
     paramItem='hrlegal' 
     :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
     :parameters="[
-        { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+        { pathName: 'hrlegals', parameterName: 'hrlegal' },
     ]"
     :context="context"
     :viewparams="viewparams"
@@ -147,7 +147,7 @@
     paramItem='hrlegal' 
     :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
     :parameters="[
-        { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+        { pathName: 'hrlegals', parameterName: 'hrlegal' },
     ]"
     :context="context"
     :viewparams="viewparams"

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Phrapi
-      cd humanresource-provider/humanresource-provider-hrapi
-      mvn -Phrapi docker:build
-      mvn -Phrapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Ppim
+      cd humanresource-app/humanresource-app-pim
+      mvn -Ppim docker:build
+      mvn -Ppim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 8080
+EXPOSE 10327
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "8080:8080"
+      - "10327:10327"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10327
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
 
-EXPOSE 10317
+EXPOSE 8081
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "10317:10317"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10317
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: