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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-08-08 15:28:29 +07:00
parent 68299d2a07
commit 3badc39ac2
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/DevelopmentController.ts
View file

@ -1189,12 +1189,14 @@ export class DevelopmentController extends Controller {
data.provinceId = _null; data.provinceId = _null;
} }
} }
data.developmentId = development.id; if (x.address) {
data.createdUserId = request.user.sub; data.developmentId = development.id;
data.createdFullName = request.user.name; data.createdUserId = request.user.sub;
data.lastUpdateUserId = request.user.sub; data.createdFullName = request.user.name;
data.lastUpdateFullName = request.user.name; data.lastUpdateUserId = request.user.sub;
await this.developmentAddresssRepository.save(data, { data: request }); data.lastUpdateFullName = request.user.name;
await this.developmentAddresssRepository.save(data, { data: request });
}
// setLogDataDiff(request, { before, after: development }); // setLogDataDiff(request, { before, after: development });
}), }),
); );
@ -1509,7 +1511,7 @@ export class DevelopmentController extends Controller {
getDevelopment.developmentRisks == null getDevelopment.developmentRisks == null
? null ? null
: getDevelopment.developmentRisks.sort((a, b) => : getDevelopment.developmentRisks.sort((a, b) =>
(a.id == null ? "" : a.id).localeCompare(b.id == null ? "" : b.id), (a.createdAt.toString() == null ? "" : a.createdAt.toString()).localeCompare(b.createdAt.toString() == null ? "" : b.createdAt.toString()),
), ),
expect: getDevelopment.expect, expect: getDevelopment.expect,
}; };
@ -2131,11 +2133,6 @@ export class DevelopmentController extends Controller {
getDevelopment.developmentAddresss == null getDevelopment.developmentAddresss == null
? null ? null
: getDevelopment.developmentAddresss : getDevelopment.developmentAddresss
.sort((a, b) =>
(a.id == null ? "" : a.id).localeCompare(
b.id == null ? "" : b.id,
),
)
}; };
return new HttpSuccess(_getDevelopment); return new HttpSuccess(_getDevelopment);
} }
@ -2235,7 +2232,7 @@ export class DevelopmentController extends Controller {
getDevelopment.developmentOthers == null getDevelopment.developmentOthers == null
? null ? null
: getDevelopment.developmentOthers.sort((a, b) => : getDevelopment.developmentOthers.sort((a, b) =>
(a.id == null ? "" : a.id).localeCompare(b.id == null ? "" : b.id), (a.createdAt.toString() == null ? "" : a.createdAt.toString()).localeCompare(b.createdAt.toString() == null ? "" : b.createdAt.toString()),
), ),
obstacle: getDevelopment.obstacle, obstacle: getDevelopment.obstacle,
suggestion: getDevelopment.suggestion, suggestion: getDevelopment.suggestion,

2
src/entities/DevelopmentAddress.ts
View file

@ -38,5 +38,5 @@ export class CreateDevelopmentAddress {
@Column() @Column()
address: string | null; address: string | null;
@Column() @Column()
provinceId: string; provinceId: string | null;
} }