TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(surgery-type): fix the list from clause

Browse Source
This commit is contained in:
avicenan
2026-05-04 14:23:55 +07:00
parent acce0861a9
commit 1c0474600f
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/surgery_type.ts
View File

@ -47,7 +47,7 @@ export class SurgeryTypeController {
const res_count = query; const res_count = query;
const res_list = query const res_list = query
.orderBy("SurgeryType." + param.order_field, param.order_direction) .orderBy("st." + param.order_field, param.order_direction)
.offset(offset) .offset(offset)
.limit(limit); .limit(limit);
@ -110,7 +110,7 @@ export class SurgeryTypeController {
let param: { id: string } = await schema.validateAsync(req.params); let param: { id: string } = await schema.validateAsync(req.params);
let surgeryType = await SurgeryTypeModel.list({ "SurgeryType.id": param.id }).then((q) => q.getOne()); let surgeryType = await SurgeryTypeModel.list({ "st.id": param.id }).then((q) => q.getOne());
if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found }; if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found };
@ -142,7 +142,7 @@ export class SurgeryTypeController {
let exist = await SurgeryTypeModel.list({ name: param.name }).then((q) => q.getOne()); let exist = await SurgeryTypeModel.list({ name: param.name }).then((q) => q.getOne());
if (exist && exist.id != param.id) throw { message: "Surgery Type " + Language.lang.failed_duplicate }; if (exist && exist.id != param.id) throw { message: "Surgery Type " + Language.lang.failed_duplicate };
let surgeryType = await SurgeryTypeModel.list({ "SurgeryType.id": param.id }).then((q) => q.getOne()); let surgeryType = await SurgeryTypeModel.list({ "st.id": param.id }).then((q) => q.getOne());
if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found }; if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found };

12
src/model/surgery_type.ts
View File

@ -9,11 +9,17 @@ export class SurgeryTypeModel {
let whereAttr: string[] = []; let whereAttr: string[] = [];
let whereVal: any = {}; let whereVal: any = {};
if (filter && Object.keys(filter).length > 0) { if (filter && Object.keys(filter).length > 0) {
whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr]; const normalized: Record<string, unknown> = {};
whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal }; for (const key of Object.keys(filter)) {
const nk = key.replace(/^SurgeryType\./, "st.");
normalized[nk] = (filter as Record<string, unknown>)[key];
}
const parsed = CommonHelper.handleQueryFilter(normalized, "st");
whereAttr = [...whereAttr, ...parsed.whereAttr];
whereVal = { ...whereVal, ...parsed.whereVal };
} }
var query = repo.createQueryBuilder("SurgeryType"); var query = repo.createQueryBuilder("st");
if (whereAttr.length != 0) { if (whereAttr.length != 0) {
query = query.where(whereAttr.join(" and "), whereVal); query = query.where(whereAttr.join(" and "), whereVal);
} }