Commit ed2d5887 authored by 黄奎's avatar 黄奎

页面修改

parent 857114d7
...@@ -896,7 +896,7 @@ namespace Edu.Module.Customer ...@@ -896,7 +896,7 @@ namespace Edu.Module.Customer
/// <param name="EndTime">结束时间</param> /// <param name="EndTime">结束时间</param>
/// <param name="qEmpIds">员工编号</param> /// <param name="qEmpIds">员工编号</param>
/// <returns></returns> /// <returns></returns>
public List<object> MarketChannelStudentStaticModule(string StartTime, string EndTime,string qEmpIds) public List<object> MarketChannelStudentStaticModule(string StartTime, string EndTime, string qEmpIds,bool isHaveAuth=false)
{ {
List<object> list = new List<object>(); List<object> list = new List<object>();
var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
...@@ -921,11 +921,16 @@ namespace Edu.Module.Customer ...@@ -921,11 +921,16 @@ namespace Edu.Module.Customer
var tempList = dataList?.Where(qitem => qitem.CreateBy == eItem.Id)?.ToList(); var tempList = dataList?.Where(qitem => qitem.CreateBy == eItem.Id)?.ToList();
//包含的数据 //包含的数据
string singleIds = ""; string singleIds = "";
string authId = "1";
if (isHaveAuth)
{
authId = "2";
}
if (channelList != null && channelList.Count > 0) if (channelList != null && channelList.Count > 0)
{ {
foreach (var item in channelList) foreach (var item in channelList)
{ {
if (item.StaticTypeList != null && item.StaticTypeList.Contains("1")) if (item.StaticTypeList != null && item.StaticTypeList.Contains(authId))
{ {
singleIds += "," + item.Id; singleIds += "," + item.Id;
var channelTempList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.EmployeeInput && qitem.StuChannel == item.Id)?.ToList(); var channelTempList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.EmployeeInput && qitem.StuChannel == item.Id)?.ToList();
......
...@@ -2791,7 +2791,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -2791,7 +2791,7 @@ namespace Edu.WebApi.Controllers.User
{ {
qEmpIds = string.Join(",", empList); qEmpIds = string.Join(",", empList);
} }
var data = marketConsultantModule.MarketChannelStudentStaticModule(startTime, endTime, qEmpIds); var data = marketConsultantModule.MarketChannelStudentStaticModule(startTime, endTime, qEmpIds, isHaveAuth: base.CheckUserActionAuth("Query_MarketConsultant"));
return ApiResult.Success(data: data); return ApiResult.Success(data: data);
} }
......
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