diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js index de84d69dacffe7da02d7878d9ed7463f91840a07..2012d8a604f15cf2a934ed84d654cba2678f069b 100644 --- a/src/libs/routes/school.js +++ b/src/libs/routes/school.js @@ -479,33 +479,23 @@ rqfCount.addField({ } }).addValue({ name: 'adm_dependency', - table: 'dependencia_adm', - tableField: 'nome', - resultField: 'adm_dependency_name', + table: 'escola', + tableField: 'dependencia_adm_id', + resultField: 'adm_dependency_id', where: { relation: '=', type: 'integer', - field: 'id' - }, - join: { - primary: 'id', - foreign: 'dependencia_adm_id', - foreignTable: 'escola' + field: 'dependencia_adm_id' } }).addValue({ name: 'adm_dependency_detailed', - table: 'dependencia_adm', - tableField: 'nome', - resultField: 'adm_dependency_detailed_name', + table: 'escola', + tableField: 'dependencia_adm_priv', + resultField: 'adm_dependency_detailed_id', where: { relation: '=', type: 'integer', - field: 'id' - }, - join: { - primary: 'id', - foreign: 'dependencia_adm_priv', - foreignTable: 'escola' + field: 'dependencia_adm_priv' } }).addValue({ name: 'location',