Commit 8beb4a17 authored by liudong1993's avatar liudong1993

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

parents 089c27fc 852da6e2
......@@ -850,7 +850,7 @@ namespace Edu.Module.Exam
Common.Plugin.LogHelper.Write(ex, "GetAppQuestionCategoryListModule_listening:" + Common.Plugin.JsonHelper.Serialize(item));
}
}
if (item.QuestionTypeKey != "listening" && item.QuestionTypeKey != "reading-comprehensio" && !string.IsNullOrEmpty(item.Answer.ToString()))
if (item.QuestionTypeKey != "listening" && item.QuestionTypeKey != "reading-comprehensio" && item.Answer!=null && !string.IsNullOrEmpty(item.Answer.ToString()))
{
try
{
......
......@@ -34,7 +34,7 @@ namespace Edu.Module.User
/// <returns></returns>
public List<RB_School_ViewModel> GetSchoolListModule(RB_School_ViewModel query)
{
return schoolRepository.GetSchoolListRepository(query); ;
return schoolRepository.GetSchoolListRepository(query);
}
/// <summary>
......
......@@ -213,7 +213,6 @@ WHERE 1=1
{
builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Question_ViewModel.SortNum));
}
return GetPage<RB_Question_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
}
......
......@@ -329,9 +329,6 @@ namespace Edu.WebApi.Controllers.User
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取学校列表
/// </summary>
......@@ -340,9 +337,17 @@ namespace Edu.WebApi.Controllers.User
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public ApiResult GetDropSchoolList()
{
var Group_Id = base.ParmJObj.GetInt("Group_Id", 100000);
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_School_ViewModel>(RequestParm.Msg.ToString());
query.Group_Id = Group_Id;
var query = new RB_School_ViewModel()
{
SName=base.ParmJObj.GetStringValue("SName"),
SAddress=base.ParmJObj.GetStringValue("SAddress"),
SLinkTel=base.ParmJObj.GetStringValue("SLinkTel"),
SDomain=base.ParmJObj.GetStringValue("SDomain"),
Remark=base.ParmJObj.GetStringValue("Remark"),
SId=base.ParmJObj.GetInt("SId"),
QSIds=base.ParmJObj.GetStringValue("QSIds"),
};
query.Group_Id = base.ParmJObj.GetInt("Group_Id", 100000);
var list = schoolModule.GetSchoolListModule(query);
return ApiResult.Success(data: list);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment