|
@@ -97,12 +97,17 @@ class TaskService extends CrudService {
|
|
|
lessonid: { $in: lessonids },
|
|
|
});
|
|
|
taskList = JSON.parse(JSON.stringify(taskList));
|
|
|
+ const arr = [];
|
|
|
+ for (const task of taskList) {
|
|
|
+ const r = arr.find(f => f.studentid === task.studentid && f.lessonid === task.lessonid);
|
|
|
+ if (r) arr.push(task);
|
|
|
+ }
|
|
|
// taskList = taskList.map(i => {
|
|
|
// const r = lessonList.find(i => i._id === i.lessonid);
|
|
|
// if (r) i.lessonname = r.subname;
|
|
|
// return i;
|
|
|
// });
|
|
|
- return JSON.parse(JSON.stringify(taskList));
|
|
|
+ return JSON.parse(JSON.stringify(arr));
|
|
|
}
|
|
|
|
|
|
async getFnDir(range) {
|