Commit 7c6400e7 authored by 黄奎's avatar 黄奎

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

parents 6f96d1b7 56656e43
......@@ -170,15 +170,15 @@ namespace Edu.WebApi.Controllers.Applet
var userInfo = base.AppletUserInfo;
var Robj = scrollClassModule.GetScrollAppointmentBaseInfo(userInfo, out string Rmsg);
return ApiResult.Failed("此功能暂未开通使用");
//if (Rmsg == "")
//{
// return ApiResult.Success("", Robj);
//}
//else
//{
// return ApiResult.Failed(Rmsg);
//}
//return ApiResult.Failed("此功能暂未开通使用");
if (Rmsg == "")
{
return ApiResult.Success("", Robj);
}
else
{
return ApiResult.Failed(Rmsg);
}
}
/// <summary>
......@@ -195,14 +195,15 @@ namespace Edu.WebApi.Controllers.Applet
}
Date = Convert.ToDateTime(Date).ToString("yyyy-MM-dd");
var Robj = scrollClassModule.GetScrollAppointmentTeacherList(userInfo, Date, SchoolId, out string Rmsg);
return ApiResult.Failed("此功能暂未开通使用");
//if (Rmsg == "")
//{
// return ApiResult.Success("", Robj);
//}
//else {
// return ApiResult.Failed(Rmsg);
//}
//return ApiResult.Failed("此功能暂未开通使用");
if (Rmsg == "")
{
return ApiResult.Success("", Robj);
}
else
{
return ApiResult.Failed(Rmsg);
}
}
/// <summary>
......
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