Merge branch 'develop-rc' into develop

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<Version>5.2208.17</Version>
-		<AssemblyVersion>5.2208.17.1</AssemblyVersion>
-		<FileVersion>5.2208.17.1</FileVersion>
+		<Version>5.2208.24</Version>
+		<AssemblyVersion>5.2208.24.1</AssemblyVersion>
+		<FileVersion>5.2208.24.1</FileVersion>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/Controllers/XTest/FixDataController.cs

@@ -2708,10 +2708,10 @@ namespace TEAMModelOS.Controllers
         public async Task<IActionResult> GenSchoolTeacherPdf(JsonElement json) {
             var client = _azureCosmos.GetCosmosClient();
             //金牛直属。
-
+            if (!json.TryGetProperty("areaId", out JsonElement areaId)) { BadRequest(); }
             //string sql = $"SELECT  distinct  c.id,s.schoolId as code , c.name as nickname, s.name as name     FROM c  join s in  c.schools where s.areaId='f35e0031-a53f-45e5-b307-1cd39446a2cf'" +
             //    $" and array_length(c.binds)>0  and s.schoolId in ({string.Join(",", schools.Select(s => $"'{s}'"))})";
-            string sql = $"SELECT  distinct  c.id,s.schoolId as code , c.name as nickname, s.name as name     FROM c  join s in  c.schools where s.areaId='870a5a6b-1ab3-461a-bdeb-baec19780ddb'" +
+            string sql = $"SELECT  distinct  c.id,s.schoolId as code , c.name as nickname, s.name as name     FROM c  join s in  c.schools where s.areaId='{areaId}'" +
                $" and array_length(c.binds)>0  ";
             List<IdNameCode> tmdidSchooCode = new List<IdNameCode>();
             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetItemQueryIterator<IdNameCode>(queryText: sql,
@@ -2728,7 +2728,7 @@ namespace TEAMModelOS.Controllers
                 var GenPdfQueue = _configuration.GetValue<string>("Azure:ServiceBus:GenPdfQueue");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(GenPdfQueue, messageBlobPDF);
             }
-            return Ok();
+            return Ok(group);
         }
 
         [HttpPost("restore-teacher-pdf")]

TEAMModelOS/TEAMModelOS.csproj

@@ -43,9 +43,9 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2208.17</Version>
-    <AssemblyVersion>5.2208.17.1</AssemblyVersion>
-    <FileVersion>5.2208.17.1</FileVersion>
+    <Version>5.2208.24</Version>
+    <AssemblyVersion>5.2208.24.1</AssemblyVersion>
+    <FileVersion>5.2208.24.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
     <PackageReleaseNotes>IES版本说明版本切换标记202200701</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>