update

TEAMModelOS.FunctionV4/HttpTrigger/IESHttpTrigger.cs

@@ -165,7 +165,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                                     foreach (var subject in subjects)
                                     {
                                         //获取同名学科，且没绑定的
-                                        var sub = period.subjects.FindAll(sub => sub.name.Equals(subject) && string.IsNullOrWhiteSpace(sub.bindId));
+                                        var sub = period.subjects.FindAll(sub => sub.name.Contains(subject) && string.IsNullOrWhiteSpace(sub.bindId));
                                         if (sub.IsNotEmpty())
                                         {
                                             sub[0].bindId = unBindId;

TEAMModelOS/Controllers/Common/AreaController.cs

@@ -606,41 +606,46 @@ namespace TEAMModelOS.Controllers
                         }
                     }
                 }
-                var querySchool = $"select c.id,c.school,c.pId from c where c.pk = 'Art' and c.pId in ({string.Join(",", pIds.Select(o => $"'{o}'"))})";
-                await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: querySchool))
+                if (pIds.Any())
                 {
-
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
+                    var querySchool = $"select c.id,c.school,c.pId from c where c.pk = 'Art' and c.pId in ({string.Join(",", pIds.Select(o => $"'{o}'"))})";
+                    await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: querySchool))
                     {
-                        foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+
+                        using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
-                            artsSchools.Add((obj.GetProperty("id").ToString(), obj.GetProperty("school").ToString(), obj.GetProperty("pId").ToString()));
+                            foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+                            {
+                                artsSchools.Add((obj.GetProperty("id").ToString(), obj.GetProperty("school").ToString(), obj.GetProperty("pId").ToString()));
+                            }
                         }
                     }
+                    var artSc = artsSchools.Select(x => new
+                    {
+                        x.id,
+                        x.code,
+                        x.pd
+                    });
+                    var arts = artMore.Select(x => new
+                    {
+                        x.id,
+                        x.name,
+                        startTime = x.stime,
+                        endTime = x.etime,
+                        sc = artSc.Where(c => c.pd.Equals(x.id)).Select(p => new { p.id, p.code })
+                    });
+                    return Ok(new { arts });
+                }
+                else { 
+                    return Ok(new { arts=new List<dynamic> { } });
                 }
-                var artSc = artsSchools.Select(x => new
-                {
-                    x.id,
-                    x.code,
-                    x.pd
-                });
-                var arts = artMore.Select(x => new
-                {
-                    x.id,
-                    x.name,
-                    startTime = x.stime,
-                    endTime = x.etime,
-                    sc = artSc.Where(c => c.pd.Equals(x.id)).Select(p => new { p.id, p.code })
-                });
-                return Ok(new { arts });
             }
             catch (Exception e)
             {
                 await _dingDing.SendBotMsg($"OS，{_option.Location}，area/find-all-art()\n{e.Message}\n{e.StackTrace}", GroupNames.醍摩豆服務運維群組);
                 return BadRequest();
             }
-
         }