Commit 9066950e authored by 任国军's avatar 任国军

fix institutions bug

parent ab5a3042
Pipeline #16684 passed with stage
in 52 seconds
...@@ -56,7 +56,6 @@ class InstitutionService extends Service { ...@@ -56,7 +56,6 @@ class InstitutionService extends Service {
// const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息 // const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息
const area_distance_list = await this.calcDistance(institution_area_list, { lat, lng }, page, distance); const area_distance_list = await this.calcDistance(institution_area_list, { lat, lng }, page, distance);
const area_distance = area_distance_list.rows; const area_distance = area_distance_list.rows;
console.log(area_distance_list);
const institution_areas = await this.computeDistance(area_distance, { lat, lng }); const institution_areas = await this.computeDistance(area_distance, { lat, lng });
for (const i in institution_areas) { for (const i in institution_areas) {
area_distance[i].distance = Number(institution_areas[i].distance) === 0 ? 999999999.0 : parseFloat(institution_areas[i].distance); area_distance[i].distance = Number(institution_areas[i].distance) === 0 ? 999999999.0 : parseFloat(institution_areas[i].distance);
...@@ -307,7 +306,6 @@ class InstitutionService extends Service { ...@@ -307,7 +306,6 @@ class InstitutionService extends Service {
// 机构列表 并有多校区 {id:1,..., course_areas:[{},{}] // 机构列表 并有多校区 {id:1,..., course_areas:[{},{}]
async getInstitutionAreaList(institutions) { async getInstitutionAreaList(institutions) {
const { ctx } = this; const { ctx } = this;
if (!Array.isArray(institutions) || institutions.length === 0) { if (!Array.isArray(institutions) || institutions.length === 0) {
...@@ -317,8 +315,8 @@ class InstitutionService extends Service { ...@@ -317,8 +315,8 @@ class InstitutionService extends Service {
const ret = []; const ret = [];
for (const i in institutions) { for (const i in institutions) {
const institution = institutions[i]; const institution = institutions[i];
if (!institution.course_areas || institution.course_areas.length === 0) continue; if (!institution.course_area_v1s || institution.course_area_v1s.length === 0) continue;
const course_areas = institution.course_areas; const course_areas = institution.course_area_v1s;
for (const j in course_areas) { for (const j in course_areas) {
const course_area = course_areas[j]; const course_area = course_areas[j];
ret.push({ ret.push({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment