no message
This commit is contained in:
parent
9020e5036b
commit
4aa3c979b8
3 changed files with 7 additions and 7 deletions
|
|
@ -3199,7 +3199,7 @@ export class PositionController extends Controller {
|
|||
) {
|
||||
let typeCondition: any = {};
|
||||
let conditionA =
|
||||
"positions.posTypeId LIKE :posType AND positions.posLevelId LIKE :posLevel AND positions.positionName LIKE :position";
|
||||
"posType.posTypeId LIKE :posTypeName AND posLevel.posLevelName LIKE :posLevel AND positions.positionName LIKE :position";
|
||||
|
||||
let posType = await this.posTypeRepository.findOne({
|
||||
where: { id: String(body.posType) },
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ export class ProfileController extends Controller {
|
|||
// ],
|
||||
relations: ["currentSubDistrict", "currentDistrict", "currentProvince", "profileAvatars"],
|
||||
order: {
|
||||
profileAvatars: { createdAt: "DESC" },
|
||||
profileAvatars: { createdAt: "ASC" },
|
||||
},
|
||||
where: { id: id },
|
||||
});
|
||||
|
|
@ -527,7 +527,7 @@ export class ProfileController extends Controller {
|
|||
});
|
||||
const Cert =
|
||||
certs.length > 0
|
||||
? certs.map((item) => ({
|
||||
? certs.slice(-3).map((item) => ({
|
||||
CertificateType: item.certificateType ?? null,
|
||||
Issuer: item.issuer ?? null,
|
||||
CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
|
||||
|
|
@ -547,7 +547,7 @@ export class ProfileController extends Controller {
|
|||
});
|
||||
const Training =
|
||||
trainings.length > 0
|
||||
? trainings.map((item) => ({
|
||||
? trainings.slice(-3).map((item) => ({
|
||||
Institute: item.department ?? "",
|
||||
Start:
|
||||
item.startDate == null
|
||||
|
|
@ -583,7 +583,7 @@ export class ProfileController extends Controller {
|
|||
});
|
||||
const Discipline =
|
||||
disciplines.length > 0
|
||||
? disciplines.map((item) => ({
|
||||
? disciplines.slice(-3).map((item) => ({
|
||||
DisciplineYear:
|
||||
Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ??
|
||||
null,
|
||||
|
|
@ -605,7 +605,7 @@ export class ProfileController extends Controller {
|
|||
});
|
||||
const Education =
|
||||
educations.length > 0
|
||||
? educations.map((item) => ({
|
||||
? educations.slice(-3).map((item) => ({
|
||||
Institute: item.institute,
|
||||
Start:
|
||||
item.startDate == null
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
// ],
|
||||
relations: ["currentSubDistrict", "currentDistrict", "currentProvince", "profileAvatars"],
|
||||
order: {
|
||||
profileAvatars: { createdAt: "DESC" },
|
||||
profileAvatars: { createdAt: "ASC" },
|
||||
},
|
||||
where: { id: id },
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue