check point
This commit is contained in:
parent
c78548410b
commit
9bfc141e4b
2 changed files with 3 additions and 2 deletions
|
|
@ -1574,7 +1574,7 @@ export class OrganizationController extends Controller {
|
||||||
/**
|
/**
|
||||||
* API เผยแพร่ข้อมูล
|
* API เผยแพร่ข้อมูล
|
||||||
*
|
*
|
||||||
* @summary ORG_053 - เผยแพร่ข้อมูล (ADMIN) #57
|
* @summary ORG_071 - เผยแพร่ข้อมูล (ADMIN) #57
|
||||||
*
|
*
|
||||||
* @param {string} id Id revison
|
* @param {string} id Id revison
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -832,7 +832,7 @@ export class PositionController extends Controller {
|
||||||
/**
|
/**
|
||||||
* API รายการอัตรากำลัง
|
* API รายการอัตรากำลัง
|
||||||
*
|
*
|
||||||
* @summary ORG_053 - รายการอัตรากำลัง (ADMIN) #56
|
* @summary ORG_070 - รายการอัตรากำลัง (ADMIN) #56
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Post("master/list")
|
@Post("master/list")
|
||||||
|
|
@ -999,6 +999,7 @@ export class PositionController extends Controller {
|
||||||
.leftJoinAndSelect("posMaster.current_holder", "current_holder")
|
.leftJoinAndSelect("posMaster.current_holder", "current_holder")
|
||||||
.leftJoinAndSelect("posMaster.next_holder", "next_holder")
|
.leftJoinAndSelect("posMaster.next_holder", "next_holder")
|
||||||
.where(conditions)
|
.where(conditions)
|
||||||
|
// .where("posMaster.orgRevisionId = :revisionId", { revisionId: body.revisionId })
|
||||||
.orWhere(
|
.orWhere(
|
||||||
new Brackets((qb) => {
|
new Brackets((qb) => {
|
||||||
qb.where(searchShortName)
|
qb.where(searchShortName)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue