Commit 6ef239fa authored by 黄奎's avatar 黄奎

页面修改

parent 4c9ac603
......@@ -543,6 +543,24 @@ namespace Mall.Module.MarketingCenter
}
return list;
}
/// <summary>
/// 获取教育学员信息
/// </summary>
/// <param name="stuIds"></param>
/// <returns></returns>
public RB_Account_ViewModel GetEduStudentModule(string stuIds)
{
List<RB_Account_ViewModel> StuList = new List<RB_Account_ViewModel>();
if (!string.IsNullOrEmpty(stuIds))
{
StuList = accountRepository.GetStudentExt(new RB_Account_ViewModel()
{
QIds = stuIds
});
}
return StuList.FirstOrDefault();
}
#endregion
}
}
......@@ -364,18 +364,32 @@ namespace Mall.WebApi.Controllers.MarketingCenter
}
}
var userModel = userModule.GetMemberUserInfo(model.UserId ?? 0);
if (userModel == null)
var obj = new object();
if (model.UserType == 1)
{
userModel = new Model.Extend.User.RB_Member_User_Extend();
var userModel = userModule.GetMemberUserInfo(model.UserId ?? 0);
if (userModel == null)
{
userModel = new Model.Extend.User.RB_Member_User_Extend();
}
obj = new
{
userModel.Name,
userModel.Photo,
CreateDateStr = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
};
}
var obj = new
else
{
userModel.Name,
userModel.Photo,
CreateDateStr = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
};
var studentModel = module.GetEduStudentModule(model.UserId.ToString());
obj = new
{
Name = studentModel?.AccountName ?? "",
Photo = studentModel?.UserIcon ?? "",
CreateDateStr = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
};
}
return ApiResult.Success("请求成功!", new
{
surverList = surverList.Where(x => x.FormType == FormTypeEnum.Survey),
......
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