Merge branch 'Uat_IRC_Net8' into Test_IRC_Net8

2025-02-14 14:18:51 +08:00
parent a578be8336 c2c8f65aaa
commit 2ea90a66ae
2 changed files with 23 additions and 6 deletions
@@ -408,9 +408,9 @@ namespace IRaCIS.Core.Application.Image.QA
                                                ParentTriggerValue = data.ParentTriggerValue,
                                                Type = data.Type,
                                                TypeValue = data.TypeValue
-                                            }).ToListAsync();
+                                            }).OrderBy(t => t.ShowOrder).ToListAsync();

-            var result = questionAnswerlist.Where(x => x.ParentId == null).ToList();
+            var result = questionAnswerlist.Where(x => x.ParentId == null).OrderBy(t=>t.ShowOrder).ToList();
            result.ForEach(x =>
            {
                GetQuestionChild(x, questionAnswerlist);
@@ -422,7 +422,7 @@ namespace IRaCIS.Core.Application.Image.QA

        private void GetQuestionChild(QCQuestionAnswer parent, List<QCQuestionAnswer> dataList)
        {
-            parent.Childrens = dataList.Where(x => x.ParentId == parent.Id).ToList();
+            parent.Childrens = dataList.Where(x => x.ParentId == parent.Id).OrderBy(t => t.ShowOrder).ToList();

            if (parent.Childrens.Count != 0)
            {