Merge branch 'develop-Bright' into develop

This commit is contained in:
Bright 2024-11-27 15:33:23 +07:00
commit f8e175ae12

View file

@ -171,7 +171,7 @@ export class KpiUserEvaluationController extends Controller {
});
}),
)
.orderBy("kpiUserEvaluation.createdAt", "ASC")
.orderBy("kpiUserEvaluation.createdAt", "DESC")
.skip((requestBody.page - 1) * requestBody.pageSize)
.take(requestBody.pageSize)
.getManyAndCount();
@ -1050,7 +1050,7 @@ export class KpiUserEvaluationController extends Controller {
evaluationStatus: status == undefined ? "" : status.trim().toUpperCase(),
},
)
.orderBy("kpiUserEvaluation.createdAt", "ASC")
.orderBy("kpiUserEvaluation.createdAt", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();