页面修改

Edu.Cache/User/UserReidsCache.cs

@@ -3,6 +3,7 @@ using Edu.Common;
 using Edu.Common.API;
 using Edu.Common.Enum;
 using Edu.Common.Enum.Customer;
+using Edu.Common.Enum.User;
 using Edu.Model.CacheModel;
 using Edu.Repository.Customer;
 using Edu.Repository.User;
@@ -161,6 +162,8 @@ namespace Edu.Cache.User
                                 DeptName = model.DeptName,
                                 PostName = model.PostName,
                                 Email = model.Email,
+                                IsTenCccUser = model.IsTenCccUser,
+                                IsCourseConsultant = (model != null && model.UserRole == UserRoleEnum.CourseConsultant) ? 1 : 0,
                             };
                             UserInfoSet(Cache.CacheKey.User_Login_Key + Id.ToString(), userInfo, Common.Config.JwtExpirTime);
                         }

Edu.Module.Exam/CourseExamModule.cs

@@ -73,32 +73,31 @@ namespace Edu.Module.Exam
                 {
                     var titleRandomNum = Common.ConvertHelper.CreateRandomNum();
                     var tempWords = reviewList[i];
-          
-                    reviewGroupList.Add(CreateSingleModule(tempWords,totalList));
-                    ////选择题
-                    //if (titleRandomNum % 2 == 0)
-                    //{
-                    //  
-                    //    if (tempList != null && tempList.Count > 2)
-                    //    {
-                    //        reviewGroupList.Add(CreateSingleModule(tempWords, tempList));
-                    //    }
-                    //    else
-                    //    {
-                    //        if (!string.IsNullOrEmpty(tempWords.ChineseMean) || !string.IsNullOrEmpty(tempWords.WordWrite))
-                    //        {
-                    //            reviewGroupList.Add(CreateFillInModule(tempWords));
-                    //        }
-                    //    }
-                    //}
-                    ////填空题
-                    //else
-                    //{
-                    //    if (!string.IsNullOrEmpty(tempWords.ChineseMean) || !string.IsNullOrEmpty(tempWords.WordWrite))
-                    //    {
-                    //        reviewGroupList.Add(CreateFillInModule(tempWords));
-                    //    }
-                    //}
+                    var count = totalList?.Where(qitem => qitem.Id != tempWords.Id)?.Count()??0;
+                   // reviewGroupList.Add(CreateSingleModule(tempWords,totalList));
+                    //选择题
+                    if (titleRandomNum % 2 == 0)
+                    {
+                        if (count > 2)
+                        {
+                            reviewGroupList.Add(CreateSingleModule(tempWords, totalList));
+                        }
+                        else
+                        {
+                            if (!string.IsNullOrEmpty(tempWords.ChineseMean) || !string.IsNullOrEmpty(tempWords.WordWrite))
+                            {
+                                reviewGroupList.Add(CreateFillInModule(tempWords));
+                            }
+                        }
+                    }
+                    //填空题
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(tempWords.ChineseMean) || !string.IsNullOrEmpty(tempWords.WordWrite))
+                        {
+                            reviewGroupList.Add(CreateFillInModule(tempWords));
+                        }
+                    }
                 }
             }