no message
This commit is contained in:
parent
2b5a236e90
commit
56fa762139
1 changed files with 22 additions and 23 deletions
|
|
@ -569,7 +569,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -580,7 +580,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictField: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -596,7 +596,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -612,7 +612,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -628,7 +628,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -639,7 +639,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -650,7 +650,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -687,7 +687,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -697,7 +697,7 @@ export class PositionController extends Controller {
|
|||
relations: ["posType", "posLevel", "posExecutive"],
|
||||
order: {
|
||||
posDictName: "ASC",
|
||||
createdAt: "DESC"
|
||||
createdAt: "DESC",
|
||||
},
|
||||
});
|
||||
break;
|
||||
|
|
@ -1336,7 +1336,7 @@ export class PositionController extends Controller {
|
|||
let typeCondition: any = {};
|
||||
let checkChildConditions: any = {};
|
||||
let keywordAsInt: any;
|
||||
let searchShortName = "";
|
||||
let searchShortName = "1=1";
|
||||
let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
|
|
@ -1795,8 +1795,7 @@ export class PositionController extends Controller {
|
|||
let typeCondition: any = {};
|
||||
let checkChildConditions: any = {};
|
||||
let keywordAsInt: any;
|
||||
let searchShortName = "";
|
||||
let labelName = "";
|
||||
let searchShortName = "1=1";
|
||||
let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
|
|
@ -4683,7 +4682,7 @@ export class PositionController extends Controller {
|
|||
let typeCondition: any = {};
|
||||
let checkChildConditions: any = {};
|
||||
let keywordAsInt: any;
|
||||
let searchShortName = "";
|
||||
let searchShortName = "1=1";
|
||||
let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue