space posno
This commit is contained in:
mamoss
parent
b1b9700e40
commit
d9fb4110e3
18 changed files with 1283 additions and 875 deletions
|
|
@ -3313,7 +3313,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x00.current_holder.avatar}/${x00.current_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x00.current_holder ? x00.current_holder.position : "",
|
||||
positionNum: x00.orgRoot.orgRootShortName + x00.posMasterNo,
|
||||
positionNum: `${x00.orgRoot.orgRootShortName} ${x00.posMasterNo}`,
|
||||
positionNumInt: x00.posMasterNo,
|
||||
departmentName: x00.orgRoot.orgRootName,
|
||||
organizationId: x00.orgRoot.id,
|
||||
|
|
@ -3347,7 +3347,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x11.current_holder.avatar}/${x11.current_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x11.current_holder ? x11.current_holder.position : "",
|
||||
positionNum: x11.orgChild1.orgChild1ShortName + x11.posMasterNo,
|
||||
positionNum: `${x11.orgChild1.orgChild1ShortName} ${x11.posMasterNo}`,
|
||||
positionNumInt: x11.posMasterNo,
|
||||
departmentName: x11.orgChild1.orgChild1Name,
|
||||
organizationId: x11.orgChild1.id,
|
||||
|
|
@ -3413,7 +3413,7 @@ export class OrganizationController extends Controller {
|
|||
positionName: x33.current_holder
|
||||
? x33.current_holder.position
|
||||
: "",
|
||||
positionNum: x33.orgChild3.orgChild3ShortName + x33.posMasterNo,
|
||||
positionNum: `${x33.orgChild3.orgChild3ShortName} ${x33.posMasterNo}`,
|
||||
positionNumInt: x33.posMasterNo,
|
||||
departmentName: x33.orgChild3.orgChild3Name,
|
||||
organizationId: x33.orgChild3.id,
|
||||
|
|
@ -3444,8 +3444,7 @@ export class OrganizationController extends Controller {
|
|||
positionName: x44.current_holder
|
||||
? x44.current_holder.position
|
||||
: "",
|
||||
positionNum:
|
||||
x44.orgChild4.orgChild4ShortName + x44.posMasterNo,
|
||||
positionNum: `${x44.orgChild4.orgChild4ShortName} ${x44.posMasterNo}`,
|
||||
positionNumInt: x44.posMasterNo,
|
||||
departmentName: x44.orgChild4.orgChild4Name,
|
||||
organizationId: x44.orgChild4.id,
|
||||
|
|
@ -3467,7 +3466,7 @@ export class OrganizationController extends Controller {
|
|||
positionName: x4.current_holder
|
||||
? x4.current_holder.position
|
||||
: "",
|
||||
positionNum: x4.orgChild4.orgChild4ShortName + x4.posMasterNo,
|
||||
positionNum: `${x4.orgChild4.orgChild4ShortName} ${x4.posMasterNo}`,
|
||||
positionNumInt: x4.posMasterNo,
|
||||
departmentName: x4.orgChild4.orgChild4Name,
|
||||
organizationId: x4.orgChild4.id,
|
||||
|
|
@ -3511,7 +3510,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x2.current_holder.avatar}/${x2.current_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x2.current_holder ? x2.current_holder.position : "",
|
||||
positionNum: x2.orgChild2.orgChild2ShortName + x2.posMasterNo,
|
||||
positionNum: `${x2.orgChild2.orgChild2ShortName} ${x2.posMasterNo}`,
|
||||
positionNumInt: x2.posMasterNo,
|
||||
departmentName: x2.orgChild2.orgChild2Name,
|
||||
organizationId: x2.orgChild2.id,
|
||||
|
|
@ -3533,7 +3532,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x1.current_holder.avatar}/${x1.current_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x1.current_holder ? x1.current_holder.position : "",
|
||||
positionNum: x1.orgChild1.orgChild1ShortName + x1.posMasterNo,
|
||||
positionNum: `${x1.orgChild1.orgChild1ShortName} ${x1.posMasterNo}`,
|
||||
positionNumInt: x1.posMasterNo,
|
||||
departmentName: x1.orgChild1.orgChild1Name,
|
||||
organizationId: x1.orgChild1.id,
|
||||
|
|
@ -3554,7 +3553,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x0.current_holder.avatar}/${x0.current_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x0.current_holder.position,
|
||||
positionNum: x0.orgRoot.orgRootShortName + x0.posMasterNo,
|
||||
positionNum: `${x0.orgRoot.orgRootShortName} ${x0.posMasterNo}`,
|
||||
positionNumInt: x0.posMasterNo,
|
||||
departmentName: x0.orgRoot.orgRootName,
|
||||
organizationId: x0.orgRoot.id,
|
||||
|
|
@ -3642,7 +3641,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x00.next_holder.avatar}/${x00.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x00.next_holder ? x00.next_holder.position : "",
|
||||
positionNum: x00.orgRoot.orgRootShortName + x00.posMasterNo,
|
||||
positionNum: `${x00.orgRoot.orgRootShortName} ${x00.posMasterNo}`,
|
||||
positionNumInt: x00.posMasterNo,
|
||||
departmentName: x00.orgRoot.orgRootName,
|
||||
organizationId: x00.orgRoot.id,
|
||||
|
|
@ -3674,7 +3673,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x11.next_holder.avatar}/${x11.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x11.next_holder ? x11.next_holder.position : "",
|
||||
positionNum: x11.orgChild1.orgChild1ShortName + x11.posMasterNo,
|
||||
positionNum: `${x11.orgChild1.orgChild1ShortName} ${x11.posMasterNo}`,
|
||||
positionNumInt: x11.posMasterNo,
|
||||
departmentName: x11.orgChild1.orgChild1Name,
|
||||
organizationId: x11.orgChild1.id,
|
||||
|
|
@ -3738,7 +3737,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x33.next_holder.avatar}/${x33.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x33.next_holder ? x33.next_holder.position : "",
|
||||
positionNum: x33.orgChild3.orgChild3ShortName + x33.posMasterNo,
|
||||
positionNum: `${x33.orgChild3.orgChild3ShortName} ${x33.posMasterNo}`,
|
||||
positionNumInt: x33.posMasterNo,
|
||||
departmentName: x33.orgChild3.orgChild3Name,
|
||||
organizationId: x33.orgChild3.id,
|
||||
|
|
@ -3767,8 +3766,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x44.next_holder.avatar}/${x44.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x44.next_holder ? x44.next_holder.position : "",
|
||||
positionNum:
|
||||
x44.orgChild4.orgChild4ShortName + x44.posMasterNo,
|
||||
positionNum: `${x44.orgChild4.orgChild4ShortName} ${x44.posMasterNo}`,
|
||||
positionNumInt: x44.posMasterNo,
|
||||
departmentName: x44.orgChild4.orgChild4Name,
|
||||
organizationId: x44.orgChild4.id,
|
||||
|
|
@ -3788,7 +3786,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x4.next_holder.avatar}/${x4.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x4.next_holder ? x4.next_holder.position : "",
|
||||
positionNum: x4.orgChild4.orgChild4ShortName + x4.posMasterNo,
|
||||
positionNum: `${x4.orgChild4.orgChild4ShortName} ${x4.posMasterNo}`,
|
||||
positionNumInt: x4.posMasterNo,
|
||||
departmentName: x4.orgChild4.orgChild4Name,
|
||||
organizationId: x4.orgChild4.id,
|
||||
|
|
@ -3832,7 +3830,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x2.next_holder.avatar}/${x2.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x2.next_holder ? x2.next_holder.position : "",
|
||||
positionNum: x2.orgChild2.orgChild2ShortName + x2.posMasterNo,
|
||||
positionNum: `${x2.orgChild2.orgChild2ShortName} ${x2.posMasterNo}`,
|
||||
positionNumInt: x2.posMasterNo,
|
||||
departmentName: x2.orgChild2.orgChild2Name,
|
||||
organizationId: x2.orgChild2.id,
|
||||
|
|
@ -3854,7 +3852,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x1.next_holder.avatar}/${x1.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x1.next_holder ? x1.next_holder.position : "",
|
||||
positionNum: x1.orgChild1.orgChild1ShortName + x1.posMasterNo,
|
||||
positionNum: `${x1.orgChild1.orgChild1ShortName} ${x1.posMasterNo}`,
|
||||
positionNumInt: x1.posMasterNo,
|
||||
departmentName: x1.orgChild1.orgChild1Name,
|
||||
organizationId: x1.orgChild1.id,
|
||||
|
|
@ -3873,7 +3871,7 @@ export class OrganizationController extends Controller {
|
|||
? `${x0.next_holder.avatar}/${x0.next_holder.avatarName}`
|
||||
: null,
|
||||
positionName: x0.next_holder.position,
|
||||
positionNum: x0.orgRoot.orgRootShortName + x0.posMasterNo,
|
||||
positionNum: `${x0.orgRoot.orgRootShortName} ${x0.posMasterNo}`,
|
||||
positionNumInt: x0.posMasterNo,
|
||||
departmentName: x0.orgRoot.orgRootName,
|
||||
organizationId: x0.orgRoot.id,
|
||||
|
|
@ -5888,7 +5886,7 @@ export class OrganizationController extends Controller {
|
|||
// .slice(0, 3) // Select the first 3 rows
|
||||
.map(async (x) => ({
|
||||
posmasterId: x.id,
|
||||
posNo: orgRoot.orgRootShortName + x.posMasterNo,
|
||||
posNo: `${orgRoot.orgRootShortName} ${x.posMasterNo}`,
|
||||
orgTreeId: orgRoot.id,
|
||||
orgLevel: 0,
|
||||
fullNameCurrentHolder:
|
||||
|
|
@ -5936,7 +5934,7 @@ export class OrganizationController extends Controller {
|
|||
// .slice(0, 3) // Select the first 3 rows
|
||||
.map(async (x) => ({
|
||||
posmasterId: x.id,
|
||||
posNo: orgChild1.orgChild1ShortName + x.posMasterNo,
|
||||
posNo: `${orgChild1.orgChild1ShortName} ${x.posMasterNo}`,
|
||||
orgTreeId: orgChild1.id,
|
||||
orgLevel: 1,
|
||||
fullNameCurrentHolder:
|
||||
|
|
@ -5992,7 +5990,7 @@ export class OrganizationController extends Controller {
|
|||
// .slice(0, 3) // Select the first 3 rows
|
||||
.map(async (x) => ({
|
||||
posmasterId: x.id,
|
||||
posNo: orgChild2.orgChild2ShortName + x.posMasterNo,
|
||||
posNo: `${orgChild2.orgChild2ShortName} ${x.posMasterNo}`,
|
||||
orgTreeId: orgChild2.id,
|
||||
orgLevel: 2,
|
||||
fullNameCurrentHolder:
|
||||
|
|
@ -6055,7 +6053,7 @@ export class OrganizationController extends Controller {
|
|||
// .slice(0, 3) // Select the first 3 rows
|
||||
.map(async (x) => ({
|
||||
posmasterId: x.id,
|
||||
posNo: orgChild3.orgChild3ShortName + x.posMasterNo,
|
||||
posNo: `${orgChild3.orgChild3ShortName} ${x.posMasterNo}`,
|
||||
orgTreeId: orgChild3.id,
|
||||
orgLevel: 3,
|
||||
fullNameCurrentHolder:
|
||||
|
|
@ -6124,7 +6122,7 @@ export class OrganizationController extends Controller {
|
|||
// .slice(0, 3) // Select the first 3 rows
|
||||
.map(async (x) => ({
|
||||
posmasterId: x.id,
|
||||
posNo: orgChild4.orgChild4ShortName + x.posMasterNo,
|
||||
posNo: `${orgChild4.orgChild4ShortName} ${x.posMasterNo}`,
|
||||
orgTreeId: orgChild4.id,
|
||||
orgLevel: 4,
|
||||
fullNameCurrentHolder:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue