Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Repository/Exam/RB_Examination_PublishRepository.cs

@@ -48,6 +48,7 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Publish_ViewModel.CreateBy), query.CreateBy);
                 }
             }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Publish_ViewModel.Id));
             return GetPage<RB_Examination_Publish_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -93,7 +93,7 @@ namespace Edu.WebApi.Controllers.Exam
                     item.ReviewerName,
                     item.Reviewer,
                     item.IsOpen,
-                    OpenStr = item.IsOpen == 1 ? "私有" : "公开",
+                    OpenStr = item.PaperType == 2 ? (item.IsOpen == 1 ? "私有" : "公开") : "",
                     item.ExamineStatus,
                     ExamineStatusStr = item.PaperType == 2 ? (paperModule.GetExamineStatusStr(item.ExamineStatus)) : "",
                     item.ExamineRemark,