This commit is contained in:
parent
7c77745d46
commit
e84f93f6db
1 changed files with 50 additions and 0 deletions
|
|
@ -1747,6 +1747,11 @@ export class OrganizationController extends Controller {
|
|||
"orgRoot.DIVISION_CODE",
|
||||
"orgRoot.SECTION_CODE",
|
||||
"orgRoot.JOB_CODE",
|
||||
"orgRoot.ROOT_CODE",
|
||||
"orgRoot.CHILD1_CODE",
|
||||
"orgRoot.CHILD2_CODE",
|
||||
"orgRoot.CHILD3_CODE",
|
||||
"orgRoot.CHILD4_CODE",
|
||||
"orgRoot.responsibility",
|
||||
])
|
||||
.orderBy("orgRoot.orgRootOrder", "ASC")
|
||||
|
|
@ -1786,6 +1791,11 @@ export class OrganizationController extends Controller {
|
|||
"orgChild1.DIVISION_CODE",
|
||||
"orgChild1.SECTION_CODE",
|
||||
"orgChild1.JOB_CODE",
|
||||
"orgChild1.ROOT_CODE",
|
||||
"orgChild1.CHILD1_CODE",
|
||||
"orgChild1.CHILD2_CODE",
|
||||
"orgChild1.CHILD3_CODE",
|
||||
"orgChild1.CHILD4_CODE",
|
||||
"orgChild1.responsibility",
|
||||
])
|
||||
.orderBy("orgChild1.orgChild1Order", "ASC")
|
||||
|
|
@ -1825,6 +1835,11 @@ export class OrganizationController extends Controller {
|
|||
"orgChild2.DIVISION_CODE",
|
||||
"orgChild2.SECTION_CODE",
|
||||
"orgChild2.JOB_CODE",
|
||||
"orgChild2.ROOT_CODE",
|
||||
"orgChild2.CHILD1_CODE",
|
||||
"orgChild2.CHILD2_CODE",
|
||||
"orgChild2.CHILD3_CODE",
|
||||
"orgChild2.CHILD4_CODE",
|
||||
"orgChild2.orgChild1Id",
|
||||
"orgChild2.responsibility",
|
||||
])
|
||||
|
|
@ -1865,6 +1880,11 @@ export class OrganizationController extends Controller {
|
|||
"orgChild3.DIVISION_CODE",
|
||||
"orgChild3.SECTION_CODE",
|
||||
"orgChild3.JOB_CODE",
|
||||
"orgChild3.ROOT_CODE",
|
||||
"orgChild3.CHILD1_CODE",
|
||||
"orgChild3.CHILD2_CODE",
|
||||
"orgChild3.CHILD3_CODE",
|
||||
"orgChild3.CHILD4_CODE",
|
||||
"orgChild3.orgChild2Id",
|
||||
"orgChild3.responsibility",
|
||||
])
|
||||
|
|
@ -1905,6 +1925,11 @@ export class OrganizationController extends Controller {
|
|||
"orgChild4.DIVISION_CODE",
|
||||
"orgChild4.SECTION_CODE",
|
||||
"orgChild4.JOB_CODE",
|
||||
"orgChild4.ROOT_CODE",
|
||||
"orgChild4.CHILD1_CODE",
|
||||
"orgChild4.CHILD2_CODE",
|
||||
"orgChild4.CHILD3_CODE",
|
||||
"orgChild4.CHILD4_CODE",
|
||||
"orgChild4.orgChild3Id",
|
||||
"orgChild4.responsibility",
|
||||
])
|
||||
|
|
@ -1930,6 +1955,11 @@ export class OrganizationController extends Controller {
|
|||
DIVISION_CODE: orgRoot.DIVISION_CODE,
|
||||
SECTION_CODE: orgRoot.SECTION_CODE,
|
||||
JOB_CODE: orgRoot.JOB_CODE,
|
||||
ROOT_CODE: orgRoot.ROOT_CODE,
|
||||
CHILD1_CODE: orgRoot.CHILD1_CODE,
|
||||
CHILD2_CODE: orgRoot.CHILD2_CODE,
|
||||
CHILD3_CODE: orgRoot.CHILD3_CODE,
|
||||
CHILD4_CODE: orgRoot.CHILD4_CODE,
|
||||
orgTreeOrder: orgRoot.orgRootOrder,
|
||||
orgTreePhoneEx: orgRoot.orgRootPhoneEx,
|
||||
orgTreePhoneIn: orgRoot.orgRootPhoneIn,
|
||||
|
|
@ -1961,6 +1991,11 @@ export class OrganizationController extends Controller {
|
|||
DIVISION_CODE: orgChild1.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild1.SECTION_CODE,
|
||||
JOB_CODE: orgChild1.JOB_CODE,
|
||||
ROOT_CODE: orgChild1.ROOT_CODE,
|
||||
CHILD1_CODE: orgChild1.CHILD1_CODE,
|
||||
CHILD2_CODE: orgChild1.CHILD2_CODE,
|
||||
CHILD3_CODE: orgChild1.CHILD3_CODE,
|
||||
CHILD4_CODE: orgChild1.CHILD4_CODE,
|
||||
orgTreeOrder: orgChild1.orgChild1Order,
|
||||
orgRootCode: orgRoot.orgRootCode,
|
||||
orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
|
||||
|
|
@ -2005,6 +2040,11 @@ export class OrganizationController extends Controller {
|
|||
DIVISION_CODE: orgChild2.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild2.SECTION_CODE,
|
||||
JOB_CODE: orgChild2.JOB_CODE,
|
||||
ROOT_CODE: orgChild2.ROOT_CODE,
|
||||
CHILD1_CODE: orgChild2.CHILD1_CODE,
|
||||
CHILD2_CODE: orgChild2.CHILD2_CODE,
|
||||
CHILD3_CODE: orgChild2.CHILD3_CODE,
|
||||
CHILD4_CODE: orgChild2.CHILD4_CODE,
|
||||
orgTreeOrder: orgChild2.orgChild2Order,
|
||||
orgRootCode: orgRoot.orgRootCode,
|
||||
orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
|
||||
|
|
@ -2054,6 +2094,11 @@ export class OrganizationController extends Controller {
|
|||
DIVISION_CODE: orgChild3.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild3.SECTION_CODE,
|
||||
JOB_CODE: orgChild3.JOB_CODE,
|
||||
ROOT_CODE: orgChild3.ROOT_CODE,
|
||||
CHILD1_CODE: orgChild3.CHILD1_CODE,
|
||||
CHILD2_CODE: orgChild3.CHILD2_CODE,
|
||||
CHILD3_CODE: orgChild3.CHILD3_CODE,
|
||||
CHILD4_CODE: orgChild3.CHILD4_CODE,
|
||||
orgTreeOrder: orgChild3.orgChild3Order,
|
||||
orgRootCode: orgRoot.orgRootCode,
|
||||
orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
|
||||
|
|
@ -2110,6 +2155,11 @@ export class OrganizationController extends Controller {
|
|||
DIVISION_CODE: orgChild4.DIVISION_CODE,
|
||||
SECTION_CODE: orgChild4.SECTION_CODE,
|
||||
JOB_CODE: orgChild4.JOB_CODE,
|
||||
ROOT_CODE: orgChild4.ROOT_CODE,
|
||||
CHILD1_CODE: orgChild4.CHILD1_CODE,
|
||||
CHILD2_CODE: orgChild4.CHILD2_CODE,
|
||||
CHILD3_CODE: orgChild4.CHILD3_CODE,
|
||||
CHILD4_CODE: orgChild4.CHILD4_CODE,
|
||||
orgTreeOrder: orgChild4.orgChild4Order,
|
||||
orgRootCode: orgRoot.orgRootCode,
|
||||
orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue