hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-02-20 15:23:05 +07:00
commit 4b1df34f5b
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/controllers/PositionController.ts
View file

@ -623,8 +623,8 @@ export class PositionController extends Controller {
} else { } else {
const dataDup: any = await this.posMasterRepository.findOne({ const dataDup: any = await this.posMasterRepository.findOne({
where: { where: {
orgChild3Id: orgChild3.id, id: Not(posMaster.id),
orgChild4Id: IsNull() || "", orgChild4Id: orgChild4.id,
posMasterNoPrefix: requestBody.posMasterNoPrefix, posMasterNoPrefix: requestBody.posMasterNoPrefix,
posMasterNo: requestBody.posMasterNo, posMasterNo: requestBody.posMasterNo,
posMasterNoSuffix: requestBody.posMasterNoSuffix, posMasterNoSuffix: requestBody.posMasterNoSuffix,
@ -645,8 +645,8 @@ export class PositionController extends Controller {
} else { } else {
const dataDup: any = await this.posMasterRepository.findOne({ const dataDup: any = await this.posMasterRepository.findOne({
where: { where: {
orgChild2Id: orgChild2.id, id: Not(posMaster.id),
orgChild3Id: IsNull() || "", orgChild3Id: orgChild3.id,
orgChild4Id: IsNull() || "", orgChild4Id: IsNull() || "",
posMasterNoPrefix: requestBody.posMasterNoPrefix, posMasterNoPrefix: requestBody.posMasterNoPrefix,
posMasterNo: requestBody.posMasterNo, posMasterNo: requestBody.posMasterNo,
@ -667,8 +667,8 @@ export class PositionController extends Controller {
} else { } else {
const dataDup: any = await this.posMasterRepository.findOne({ const dataDup: any = await this.posMasterRepository.findOne({
where: { where: {
orgChild1Id: orgChild1.id, id: Not(posMaster.id),
orgChild2Id: IsNull() || "", orgChild2Id: orgChild2.id,
orgChild3Id: IsNull() || "", orgChild3Id: IsNull() || "",
orgChild4Id: IsNull() || "", orgChild4Id: IsNull() || "",
posMasterNoPrefix: requestBody.posMasterNoPrefix, posMasterNoPrefix: requestBody.posMasterNoPrefix,
@ -689,8 +689,8 @@ export class PositionController extends Controller {
} else { } else {
const dataDup: any = await this.posMasterRepository.findOne({ const dataDup: any = await this.posMasterRepository.findOne({
where: { where: {
orgRootId: orgRoot.id, id: Not(posMaster.id),
orgChild1Id: IsNull() || "", orgChild1Id: orgChild1.id,
orgChild2Id: IsNull() || "", orgChild2Id: IsNull() || "",
orgChild3Id: IsNull() || "", orgChild3Id: IsNull() || "",
orgChild4Id: IsNull() || "", orgChild4Id: IsNull() || "",
@ -711,6 +711,7 @@ export class PositionController extends Controller {
} else { } else {
const dataDup: any = await this.posMasterRepository.findOne({ const dataDup: any = await this.posMasterRepository.findOne({
where: { where: {
id: Not(posMaster.id),
orgRootId: orgRoot.id, orgRootId: orgRoot.id,
orgChild1Id: IsNull() || "", orgChild1Id: IsNull() || "",
orgChild2Id: IsNull() || "", orgChild2Id: IsNull() || "",