Browse Source

昵称不自动初始化。

CrazyIter_Bin 3 years ago
parent
commit
417b6078e9

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

@@ -608,7 +608,7 @@ namespace TEAMModelOS.SDK
                         name = item.name, 
                         picture = item.picture,
                         type = 1,
-                        nickname=item.name,
+                       // nickname=item.name,
                     };
                     members.Add(member);
 
@@ -746,7 +746,7 @@ namespace TEAMModelOS.SDK
                                 id = y.id,
                                 code = school,
                                 name = y.name,
-                                nickname = y.name,
+                                //nickname = y.name,
                                 type = 2,
                                 picture = y.picture,
                                 no = y.no,
@@ -1055,14 +1055,14 @@ namespace TEAMModelOS.SDK
                 {
                     var user = tmdsData.Find(y => y.id.Equals(x.id));
                     x.name = user?.name;
-                    x.nickname = string.IsNullOrWhiteSpace(x.nickname) ? user?.name : x.nickname;
+                   // x.nickname = string.IsNullOrWhiteSpace(x.nickname) ? user?.name : x.nickname;
                     x.picture = user?.picture;
                 });
                 students.ForEach(x =>
                 {
                     var student = studentsData.Find(y => y.id.Equals(x.id) && y.schoolId.Equals(x.code));
                     x.name = student?.name;
-                    x.nickname = string.IsNullOrWhiteSpace(x.nickname) ? student?.name:x.nickname;
+                   // x.nickname = string.IsNullOrWhiteSpace(x.nickname) ? student?.name:x.nickname;
                     x.picture = student?.picture;
                     x.classId = student?.classId;
                 });
@@ -1083,14 +1083,14 @@ namespace TEAMModelOS.SDK
                     {
                         var tmd = tmdids.Find(t => t.id.Equals(y.id));
                         y.name = tmd?.name;
-                        y.nickname = string.IsNullOrWhiteSpace(y.nickname) ? tmd?.nickname : y.nickname;
+                        //y.nickname = string.IsNullOrWhiteSpace(y.nickname) ? tmd?.nickname : y.nickname;
                         y.picture = tmd?.picture;
                     }
                     if (y.type == 2)
                     {
                         var student = students.Find(t => t.id.Equals(y.id) && t.code.Equals(y.code));
                         y.name = student?.name;
-                        y.nickname =  string.IsNullOrWhiteSpace(y.nickname) ? student?.nickname : y.nickname; 
+                      //  y.nickname =  string.IsNullOrWhiteSpace(y.nickname) ? student?.nickname : y.nickname; 
                         y.picture = student?.picture;
                         y.classId = student?.classId;
                     }

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

@@ -745,7 +745,7 @@ namespace TEAMModelOS.Controllers
                                 students.Add(item);
                             }     
                             ///行政班(学生搜寻classId动态返回)class
-                            List<RMember> smembers = students.Where(x => x.classId.Equals(clazz.id)).Select(y => new RMember { nickname = y.name, id = y.id, code = $"{_code}", name = y.name, type = 2, picture = y.picture, no = y.no,classId=y.classId, groupId = y.groupId, groupName = y.groupName }).ToList();
+                            List<RMember> smembers = students.Where(x => x.classId.Equals(clazz.id)).Select(y => new RMember {  id = y.id, code = $"{_code}", name = y.name, type = 2, picture = y.picture, no = y.no,classId=y.classId, groupId = y.groupId, groupName = y.groupName }).ToList();
                             groupList = new RGroupList
                             {
                                 id=clazz.id,