Browse Source

修改名单查询。

CrazyIter_Bin 3 years ago
parent
commit
da448911ea

+ 3 - 3
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.SDK
             List<GroupListGrp> groupLists = new List<GroupListGrp>();
 
             if (groupTypes.IsEmpty() || groupTypes.Contains("class")) {
-                if (string.IsNullOrWhiteSpace(school) && memberType == 2)
+                if (!string.IsNullOrWhiteSpace(school) && memberType == 2)
                 {
                     Student student = null;
                     try
@@ -53,7 +53,7 @@ namespace TEAMModelOS.SDK
                     {
                         try
                         {
-                            Class clazz = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<Class>(memberId, new PartitionKey($"Class-{school}"));
+                            Class clazz = await client.GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<Class>(student.classId, new PartitionKey($"Class-{school}"));
                             GroupListGrp groupList = new GroupListGrp
                             {
                                 id = clazz.id,
@@ -80,7 +80,7 @@ namespace TEAMModelOS.SDK
             if (groupTypes.IsEmpty() || groupTypes.Contains("teach")) {
                 //教学班
                 StringBuilder teachsql = new StringBuilder();
-                if (string.IsNullOrWhiteSpace(school) && memberType == 2) {
+                if (!string.IsNullOrWhiteSpace(school) && memberType == 2) {
                     teachsql.Append($"SELECT distinct {SummarySql} FROM c join  m  in c.members   where c.type='teach' and  m.id='{memberId}' and m.school='{school}' and m.type=2 ");
                 }
                 if (memberType == 1)

+ 1 - 0
TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -56,6 +56,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         [HttpPost("get-student-joined-grouplist")]
         [Authorize(Roles = "IES")]
+        [AuthToken(Roles = "admin,teacher,student")]
         public async Task<IActionResult> GetMyCourseAndGroupList(JsonElement json)
         {
             var (userid, _name, _picture,school) = HttpContext.GetAuthTokenInfo();

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

@@ -336,12 +336,13 @@ namespace TEAMModelOS.Controllers
             }
             else if ($"{_scope}".Equals("private"))
             {
+                code = $"LessonRecord";
+                tbname = "Teacher";
                 request.TryGetProperty("tmdid", out JsonElement _tmdid);
                 if (!string.IsNullOrEmpty($"{_tmdid}"))
                 {
-                    code = $"LessonRecord";
+                   
                     sqlPrivate = $" and c.tmdid='{_tmdid}'";
-                    tbname = "Teacher";
                     List<string> ids = new List<string>();
                     ids.Add($"{_tmdid}");
                     if (ids.Any())
@@ -508,13 +509,12 @@ namespace TEAMModelOS.Controllers
             }
             else if ($"{_scope}".Equals("private"))
             {
+                code = $"LessonRecord";
+                tbname = "Teacher";
                 request.TryGetProperty("tmdid", out JsonElement _tmdid);
                 if (!string.IsNullOrEmpty($"{_tmdid}"))
                 {
-                    
                     sqlPrivate = $" and c.tmdid='{_tmdid}'";
-                    code = $"LessonRecord";
-                    tbname = "Teacher";
                     List<string> ids = new List<string>();
                     ids.Add($"{_tmdid}");
                     if (ids.Any())