ソースを参照

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

liqk 3 年 前
コミット
2c789914d7

+ 7 - 7
TEAMModelOS/Controllers/Both/LessonRecordController.cs

@@ -284,10 +284,10 @@ namespace TEAMModelOS.Controllers
             int count=0;
 
             string sqlShow = "";
-            if (roles.Count == 1 && roles.Contains("student"))
-            {
-                sqlShow = " and (array_contains(c.show,'student') or array_contains(c.show,'all')) ";
-            }
+            //if (roles.Count == 1 && roles.Contains("student"))
+            //{
+            //    sqlShow = " and (array_contains(c.show,'student') or array_contains(c.show,'all')) ";
+            //}
             cosmosDbQuery.QueryText = cosmosDbQuery.QueryText.Replace("where", $" where (c.status<>404 or IS_DEFINED(c.status) = false ) {sqlShow}  and  ");
             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname).GetItemQueryIterator<int>(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey(code) }))
             {
@@ -433,9 +433,9 @@ namespace TEAMModelOS.Controllers
             try
             {
                 string sqlShow = "";
-                if (roles.Count == 1 && roles.Contains("student") ) {
-                    sqlShow = " and (array_contains(c.show,'student') or array_contains(c.show,'all')) ";
-                }
+                //if (roles.Count == 1 && roles.Contains("student") ) {
+                //    sqlShow = " and (array_contains(c.show,'student') or array_contains(c.show,'all')) ";
+                //}
                 cosmosDbQuery.QueryText = cosmosDbQuery.QueryText.Replace("where", $" where (c.status<>404 or IS_DEFINED(c.status) = false ) {sqlShow} and  ");
                 await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tbname)
                    .GetItemQueryStreamIterator(queryDefinition: cosmosDbQuery.CosmosQueryDefinition, continuationToken: continuationToken,

+ 5 - 1
TEAMModelOS/Controllers/School/SchoolTeacherController.cs

@@ -315,10 +315,14 @@ namespace TEAMModelOS.Controllers
             if (users.Any()) {
                 teachers.ForEach(x => {
                     CoreUser coreUser= users.Find(u => u.id.Equals(x.id));
-                    if (coreUser != null) {
+                    if (coreUser != null)
+                    {
                         x.phone = coreUser.mobile;
                         x.email = coreUser.mail;
                     }
+                    else {
+                        x.status = "delete";
+                    }
                 });
             }
             return Ok(new { teachers });