|
@@ -18,13 +18,12 @@ class StudentService extends CrudService {
|
|
|
if (student_id)query.student_id = student_id;
|
|
|
if (school_id) query.school_id = school_id;
|
|
|
const lsList = await this.lessonStudentModel.find(query, { lesson_id: 1, is_pay: 1, is_try: 1 });
|
|
|
- console.log(lsList);
|
|
|
const lessonIds = lsList.map(i => i.lesson_id);
|
|
|
let data = await this.lessonModel.find({ _id: lessonIds, ...otherQuery }).skip(parseInt(skip)).limit(parseInt(limit));
|
|
|
if (data.length > 0) data = JSON.parse(JSON.stringify(data));
|
|
|
data = data.map(i => {
|
|
|
const { _id } = i;
|
|
|
- const r = this.lsList.find(f => ObjectId(f).equals(_id));
|
|
|
+ const r = lsList.find(f => ObjectId(f.lesson_id).equals(_id));
|
|
|
if (r) i = { ...i, ..._.pick(r, [ 'is_try', 'is_pay' ]) };
|
|
|
return i;
|
|
|
});
|