Merge branch 'master' into develop

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -1167,6 +1167,14 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                         lessonRecord.clientInteractionAverge = lessonBase.summary.clientInteractionAverge;
                                         lessonRecord.examCount = lessonBase.summary.examCount;
                                         lessonRecord.totalInteractPoint = lessonBase.summary.totalInteractPoint;
+                                        if (!string.IsNullOrWhiteSpace(lessonRecord.school)) {
+                                            lessonBase.student.ForEach(x => {
+                                                if (string.IsNullOrWhiteSpace(x.school))
+                                                {
+                                                    x.school = lessonRecord.school;
+                                                }
+                                            });
+                                        }
                                         LessonStudentRecord lessonStudentRecord = new LessonStudentRecord
                                         {
                                             clientSummaryList = lessonBase.report.clientSummaryList,