|
@@ -263,6 +263,11 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
string SearchKey = data.getItem("SearchKey").ToString(); //搜索关键词
|
|
|
+ string CybMakerCode = "";
|
|
|
+ if(value.Contains("CybMakerCode"))
|
|
|
+ {
|
|
|
+ CybMakerCode = data.getItem("CybMakerCode").ToString();
|
|
|
+ }
|
|
|
int UserId = int.Parse(function.CheckInt(data.getItem("UserId").ToString())); //创客
|
|
|
int ActiveStatus = int.Parse(function.CheckInt(data.getItem("ActiveStatus").ToString())); //达标状态(1 已达标 2 未达标)
|
|
|
int IsAct = int.Parse(function.CheckInt(data.getItem("IsAct").ToString())); //激活状态(1 已激活 2 未激活)
|
|
@@ -285,6 +290,10 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
query = query.Where(m => m.Name.Contains(SearchKey));
|
|
|
}
|
|
|
+ if(!string.IsNullOrEmpty(CybMakerCode))
|
|
|
+ {
|
|
|
+ query = query.Where(m => m.CybMakerCode == CybMakerCode);
|
|
|
+ }
|
|
|
if (Kind > 0)
|
|
|
{
|
|
|
string subjectType = "";
|