reloaded 4 år sedan
förälder
incheckning
06e96e05dc
1 ändrade filer med 21 tillägg och 0 borttagningar
  1. 21 0
      app/service/class.js

+ 21 - 0
app/service/class.js

@@ -183,7 +183,18 @@ class ClassService extends CrudService {
     const classes = _.cloneDeep(JSON.parse(JSON.stringify(_classes)));
     // 学生信息
     const students = await this.stumodel.find({ classid });
+    // 所有用户信息
+    const users = await this.umodel.find();
     if (students) {
+      for (const stu of students) {
+        const user = users.find(item => item.uid === stu.id);
+        if (user && user.openid) {
+          const _stu = _.cloneDeep(JSON.parse(JSON.stringify(stu)));
+          _stu.hasuserinfo = '1';
+          _.remove(students, stu);
+          students.push(_stu);
+        }
+      }
       classes.students = students;
     }
     // 班主任信息
@@ -213,6 +224,16 @@ class ClassService extends CrudService {
     teachers.push(lyteacher);
     teachers.push(headteacher);
     teachers = _.uniq(_.compact(teachers));
+    for (const tea of teachers) {
+      const user = users.find(item => item.uid === tea.id);
+      console.log(user);
+      if (user && user.openid) {
+        const _tea = _.cloneDeep(JSON.parse(JSON.stringify(tea)));
+        _tea.hasuserinfo = '1';
+        _.remove(teachers, tea);
+        teachers.push(_tea);
+      }
+    }
     classes.teachers = teachers;
     return classes;
   }