Browse Source

优化未加区的学校机接口

Li 2 năm trước cách đây
mục cha
commit
e9939c8614

+ 1 - 5
TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -109,13 +109,9 @@ namespace TEAMModelBI.Controllers.BISchool
 
 
                 StringBuilder sqltxt = new($"SELECT c.id,c.name,c.schoolCode,c.province,c.city,c.dist,c.picture,c.period,c.areaId,c.standard,c.manyAreas FROM c");
                 StringBuilder sqltxt = new($"SELECT c.id,c.name,c.schoolCode,c.province,c.city,c.dist,c.picture,c.period,c.areaId,c.standard,c.manyAreas FROM c");
                 if (!string.IsNullOrEmpty($"{areaId}"))
                 if (!string.IsNullOrEmpty($"{areaId}"))
-                {
                     sqltxt.Append($" WHERE c.areaId !='{areaId}'");
                     sqltxt.Append($" WHERE c.areaId !='{areaId}'");
-                }
                 else
                 else
-                {
-                    sqltxt.Append($" WHERE c.areaId ='' or c.areaId = null");
-                }
+                    sqltxt.Append($" WHERE (c.areaId ='' or c.areaId = null or IS_DEFINED(c.areaId) = false)");
 
 
                 List<NotAreaSchool> tempNotAreaSchools = new();
                 List<NotAreaSchool> tempNotAreaSchools = new();
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqltxt.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqltxt.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))