Commit 7c16a5d1 authored by liudong1993's avatar liudong1993

1

parent 66c056c0
......@@ -4945,18 +4945,21 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
//查询当期目标所有对齐 , 对齐目标的所有用户
List<object> AlignList = new List<object>();
var list = oKR_ObjectiveRepository.GetOKRMyEmployeeAlignList(userInfo.Group_Id, periodId, userInfo.Id);
string emIds = string.Join(",", list.Select(x => x.CreateBy));
var unlist = oKR_UpdateNotificationRepository.GetList(new RB_OKR_UpdateNotification_ViewModel() { ReceiveId = userInfo.Id, UpdateByIds = emIds, State = 2 });
var emlist = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel() { QIds = emIds });
foreach (var item in emlist)
if (list.Any())
{
AlignList.Add(new
string emIds = string.Join(",", list.Select(x => x.CreateBy));
var unlist = oKR_UpdateNotificationRepository.GetList(new RB_OKR_UpdateNotification_ViewModel() { ReceiveId = userInfo.Id, UpdateByIds = emIds, State = 2 });
var emlist = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel() { QIds = emIds });
foreach (var item in emlist)
{
item.Id,
item.EmployeeName,
item.UserIcon,
IsHaveUpdate = unlist.Where(x => x.UpdateBy == item.Id).Any() ? 1 : 0
});
AlignList.Add(new
{
item.Id,
item.EmployeeName,
item.UserIcon,
IsHaveUpdate = unlist.Where(x => x.UpdateBy == item.Id).Any() ? 1 : 0
});
}
}
return AlignList;
}
......
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