Merge branch 'develop5.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -225,7 +225,10 @@ namespace TEAMModelOS.Controllers
                             {
                                 access = 1;
                             }
-                            setting.accessConfig = null;
+                            if (setting != null)
+                            {
+                                setting.accessConfig = null;
+                            }
                             areas.Add(new AreaDto { areaId = area.id, name = area.name, standard = area.standard, standardName = area.standardName, setting= setting, access = access });
                         }
                         catch (CosmosException)

TEAMModelOS/Services/Common/TeacherService.cs

@@ -76,7 +76,9 @@ namespace TEAMModelOS.Services
                             if (setting != null && !string.IsNullOrWhiteSpace(setting.accessConfig)) {
                                 access = 1;
                             }
-                            setting.accessConfig = null;
+                            if (setting != null) {
+                                setting.accessConfig = null;
+                            }
                             areas.Add(new AreaDto { areaId = area.id, name = area.name,standard= area.standard,standardName= area.standardName,setting=setting, access= access });
                         }
                         catch (CosmosException)