quchong

app/service/class.js

@@ -185,20 +185,20 @@ class ClassService extends CrudService {
       classes.students = students;
     }
     // 班主任信息
+    let headteacher;
     if (classes.headteacherid) {
-      const headteacher = await this.heamodel.findById(classes.headteacherid);
-      classes.headteacher = headteacher;
+      headteacher = await this.heamodel.findById(classes.headteacherid);
     }
     // 礼仪课老师信息
+    let lyteacher;
     if (classes.lyteacherid) {
-      let lyteacher = await this.heamodel.findById(classes.lyteacherid);
+      lyteacher = await this.heamodel.findById(classes.lyteacherid);
       if (!lyteacher) {
         lyteacher = await this.teamodel.findById(classes.lyteacherid);
       }
-      classes.lyteacher = lyteacher;
     }
     // 教课老师信息
-    const teachers = [];
+    let teachers = [];
     const lessones = await this.lessmodel.findOne({ classid });
     if (lessones) {
       for (const lesson of lessones.lessons) {
@@ -208,6 +208,9 @@ class ClassService extends CrudService {
         }
       }
     }
+    teachers.push(lyteacher);
+    teachers.push(headteacher);
+    teachers = _.uniq(_.compact(teachers));
     classes.teachers = teachers;
     return classes;
   }