CrazyIter_Bin 3 vuotta sitten
vanhempi
commit
20aa45e75b

+ 10 - 10
TEAMModelOS.SDK/Models/Service/TriggerStuActivity.cs

@@ -251,7 +251,7 @@ namespace TEAMModelFunction
                     if (x.students.IsNotEmpty())
                     {
                         x.students.ForEach(y => {
-                            var stuinfo = stuInfos.Where(z => z.id == y.id).FirstOrDefault();
+                            var stuinfo = stuInfos.Where(z => z.id.Equals(y.id)).FirstOrDefault();
                             if (stuinfo != null)
                             {
                                 classListInfo.stuInfos.Add(stuinfo);
@@ -261,7 +261,7 @@ namespace TEAMModelFunction
                     if (x.tmids.IsNotEmpty())
                     {
                         x.tmids.ForEach(y => {
-                            var tmdinfo = tmdinfos.Where(z => z.id == y).FirstOrDefault();
+                            var tmdinfo = tmdinfos.Where(z => z.id.Equals(y)).FirstOrDefault();
                             if (tmdinfo != null)
                             {
                                 classListInfo.tmdInfos.Add(tmdinfo);
@@ -275,7 +275,7 @@ namespace TEAMModelFunction
                     if (x.students.IsNotEmpty())
                     {
                         x.students.ForEach(y => {
-                            var stuinfo = stuInfos.Where(z => z.id == y.id).FirstOrDefault();
+                            var stuinfo = stuInfos.Where(z => z.id.Equals(y.id)).FirstOrDefault();
                             if (stuinfo != null)
                             {
                                 classListInfo.stuInfos.Add(stuinfo);
@@ -285,7 +285,7 @@ namespace TEAMModelFunction
                     if (x.tmids.IsNotEmpty())
                     {
                         x.tmids.ForEach(y => {
-                            var tmdinfo = tmdinfos.Where(z => z.id == y).FirstOrDefault();
+                            var tmdinfo = tmdinfos.Where(z => z.id.Equals(y)).FirstOrDefault();
                             if (tmdinfo != null)
                             {
                                 classListInfo.tmdInfos.Add(tmdinfo);
@@ -301,7 +301,7 @@ namespace TEAMModelFunction
                 classInfos.ForEach(x =>
                 {
                     ClassListInfo classListInfo = new ClassListInfo { id = x.id, name = x.name };
-                    var list = students.Where(y => y.classId == x.id).ToList();
+                    var list = students.Where(y => y.classId .Equals(x.id)).ToList();
                     list.ForEach(z => { classListInfo.stuInfos.Add(new StuInfo { id = z.id, code = z.code, schoolId = z.schoolId, classId = z.classId, name = z.name, picture = z.picture, year = z.year }); });
                     classInfo.Add(classListInfo);
                 });
@@ -414,7 +414,7 @@ namespace TEAMModelFunction
                     ClassListInfo classListInfo = new ClassListInfo {id=x.id,name=x.name };
                     if (x.students.IsNotEmpty()) {
                         x.students.ForEach(y => {
-                            var stuinfo= stuInfos.Where(z => z.id == y.id).FirstOrDefault();
+                            var stuinfo= stuInfos.Where(z => z.id.Equals(y.id)).FirstOrDefault();
                             if (stuinfo != null) {
                                 classListInfo.stuInfos.Add(stuinfo);
                             }
@@ -423,7 +423,7 @@ namespace TEAMModelFunction
                     if (x.tmids.IsNotEmpty())
                     {
                         x.tmids.ForEach(y => {
-                            var tmdinfo = tmdinfos.Where(z => z.id == y).FirstOrDefault();
+                            var tmdinfo = tmdinfos.Where(z => z.id.Equals(y)).FirstOrDefault();
                             if (tmdinfo != null)
                             {
                                 classListInfo.tmdInfos.Add(tmdinfo);
@@ -437,7 +437,7 @@ namespace TEAMModelFunction
                     if (x.students.IsNotEmpty())
                     {
                         x.students.ForEach(y => {
-                            var stuinfo = stuInfos.Where(z => z.id == y.id).FirstOrDefault();
+                            var stuinfo = stuInfos.Where(z => z.id.Equals(y.id)).FirstOrDefault();
                             if (stuinfo != null)
                             {
                                 classListInfo.stuInfos.Add(stuinfo);
@@ -447,7 +447,7 @@ namespace TEAMModelFunction
                     if (x.tmids.IsNotEmpty())
                     {
                         x.tmids.ForEach(y => {
-                            var tmdinfo = tmdinfos.Where(z => z.id == y).FirstOrDefault();
+                            var tmdinfo = tmdinfos.Where(z => z.id.Equals(y)).FirstOrDefault();
                             if (tmdinfo != null)
                             {
                                 classListInfo.tmdInfos.Add(tmdinfo);
@@ -463,7 +463,7 @@ namespace TEAMModelFunction
                 classInfos.ForEach(x =>
                 {
                     ClassListInfo classListInfo = new ClassListInfo { id = x.id, name = x.name };
-                    var list= students.Where(y => y.classId == x.id).ToList();
+                    var list= students.Where(y => y.classId .Equals(x.id)).ToList();
                     list.ForEach(z => { classListInfo.stuInfos.Add(new StuInfo { id = z.id, code = z.code, schoolId = z.schoolId, classId = z.classId, name = z.name, picture = z.picture, year = z.year }); });
                     classInfo.Add(classListInfo);
                 });

+ 1 - 1
TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -213,7 +213,7 @@ namespace TEAMModelOS.Controllers.Core
                 //处理学校发布的评测
                 if (sexamRcds.IsNotEmpty()) {
                     sexamRcds.SelectMany(y => y.classes).ToList().ForEach(z => {
-                        var a = classInfo.Where(m => m.id == z.id).FirstOrDefault();
+                        var a = classInfo.Where(m => m.id .Equals(z.id)).FirstOrDefault();
                         if (a != null)
                         {
                             z.name = a.name;