Skip to content

I
ibzrt
提交 d753a0a7 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 部署微服务应用

上级 49e55081
隐藏空白字符变更
内嵌 并排
正在显示 包含 329 行增加 和 309 行删除
app_Web/src/service/ibzdepartment/ibzdepartment-service-base.ts
浏览文件 @ d753a0a7
......@@ -66,21 +66,6 @@ export default class IBZDepartmentServiceBase extends EntityService {
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
......@@ -96,13 +81,6 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzemployees = ibzemployeesData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -118,6 +96,13 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
......@@ -133,10 +118,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzemployees = ibzemployeesData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -152,13 +152,13 @@ export default class IBZDepartmentServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -190,40 +190,40 @@ export default class IBZDepartmentServiceBase extends EntityService {
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
ibzemployeesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
item.userid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
ibzemployeesData.forEach((item:any) => {
masterData.ibzemployees = ibzemployeesData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.userid = null;
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzemployees = ibzemployeesData;
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
return Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
......@@ -241,21 +241,6 @@ export default class IBZDepartmentServiceBase extends EntityService {
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
......@@ -271,13 +256,6 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzemployees = ibzemployeesData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -293,6 +271,13 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
......@@ -308,10 +293,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzemployees = ibzemployeesData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzdepartments/${context.ibzdepartment}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -327,21 +327,6 @@ export default class IBZDepartmentServiceBase extends EntityService {
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && true){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
......@@ -357,20 +342,6 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzemployees = ibzemployeesData;
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(`/ibzorganizations/${context.ibzorganization}/ibzdepartments`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -386,6 +357,20 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
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(`/ibzorganizations/${context.ibzorganization}/ibzdepartments`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
......@@ -401,6 +386,21 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData.ibzemployees = ibzemployeesData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
......@@ -410,8 +410,8 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzdepartments`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -428,14 +428,14 @@ export default class IBZDepartmentServiceBase extends EntityService {
if(context.ibzorganization && true){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/getdraft`,isloading);
res.data.ibzdepartment = data.ibzdepartment;
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let res:any = await Http.getInstance().get(`/ibzdepartments/getdraft`,isloading);
res.data.ibzdepartment = data.ibzdepartment;
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......
app_Web/src/service/ibzemployee/ibzemployee-service-base.ts
浏览文件 @ d753a0a7
......@@ -95,21 +95,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -125,14 +110,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -148,6 +125,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -163,14 +148,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -186,6 +163,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -201,13 +186,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -223,6 +201,13 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -238,10 +223,25 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -257,21 +257,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -287,14 +272,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -310,6 +287,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -325,14 +310,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -348,6 +325,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -363,10 +348,25 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
return Http.getInstance().post(`/ibzemployees/${context.ibzemployee}/checkkey`,data,isloading);
......@@ -384,25 +384,25 @@ export default class IBZEmployeeServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment && context.ibzemployee){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let res:any = await Http.getInstance().get(`/ibzemployees/${context.ibzemployee}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -418,21 +418,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -448,14 +433,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -471,6 +448,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -486,14 +471,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -509,6 +486,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -524,13 +509,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -546,6 +524,13 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -561,10 +546,25 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -580,21 +580,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
public async InitPwd(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -610,14 +595,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/initpwd`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -633,6 +610,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/initpwd`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -648,14 +633,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}/initpwd`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -671,6 +648,14 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzemployees/${context.ibzemployee}/initpwd`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && context.ibzemployee){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -686,10 +671,25 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/initpwd`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
return Http.getInstance().post(`/ibzemployees/${context.ibzemployee}/initpwd`,data,isloading);
......@@ -708,28 +708,28 @@ export default class IBZEmployeeServiceBase extends EntityService {
if(context.ibzorganization && context.ibzdepartment && true){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees/getdraft`,isloading);
res.data.ibzemployee = data.ibzemployee;
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && true){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzemployees/getdraft`,isloading);
res.data.ibzemployee = data.ibzemployee;
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && true){
let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/getdraft`,isloading);
res.data.ibzemployee = data.ibzemployee;
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let res:any = await Http.getInstance().get(`/ibzemployees/getdraft`,isloading);
res.data.ibzemployee = data.ibzemployee;
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -745,21 +745,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment && true){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -775,21 +760,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
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(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzorganization && true){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -805,6 +775,21 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
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(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzorganization && true){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -820,21 +805,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
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(`/ibzorganizations/${context.ibzorganization}/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
if(context.ibzdepartment && true){
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -850,6 +820,21 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
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(`/ibzorganizations/${context.ibzorganization}/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
if(context.ibzdepartment && true){
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -865,20 +850,6 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
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(`/ibzdepartments/${context.ibzdepartment}/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
let masterData:any = {};
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -894,6 +865,20 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
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(`/ibzdepartments/${context.ibzdepartment}/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
......@@ -909,6 +894,21 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
ibzdeptmembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.memberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
......@@ -918,8 +918,8 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......
app_Web/src/styles/default.less
浏览文件 @ d753a0a7
......@@ -64,14 +64,14 @@
// tab分页模式首页布局
.index_tab_content{
.view-container {
>.view-container {
height: calc(100% - 65px);
margin: 0px 12px;
}
}
// 面包屑模式首页布局
.index_route_content{
.view-container {
>.view-container {
height: calc(100% - 36px);
margin: 12px;
}
......
config.xml
浏览文件 @ d753a0a7
......@@ -37,6 +37,11 @@
git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/
mvn clean package -Pweb
cd ibzrt-app/ibzrt-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
浏览文件 @ d753a0a7
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
EXPOSE 8080
EXPOSE 30000
ADD ibzrt-app-web.jar /ibzrt-app-web.jar
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @ d753a0a7
......@@ -3,9 +3,22 @@ services:
ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports:
- "8080:8080"
- "30000:30000"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
ibzrt-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ d753a0a7
......@@ -11,6 +11,7 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.util.DigestUtils;
import java.io.InputStream;
import java.util.*;
......@@ -40,6 +41,7 @@ public class PermissionSyncJob implements ApplicationRunner {
system.put("pssystemid",systemId);
system.put("pssystemname",systemId);
system.put("sysstructure",JSONObject.parseObject(permissionResult));
system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
if(client.syncSysAuthority(system)){
log.info("向[UAA]同步系统资源成功");
}else{
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或