Commit c361414a authored by liudong1993's avatar liudong1993

1

parent 5a997bdc
...@@ -2292,7 +2292,9 @@ namespace Edu.Module.Course ...@@ -2292,7 +2292,9 @@ namespace Edu.Module.Course
OldName = accountRepository.GetEmployeeInfo(orderModel.HelpEnterId)?.EmployeeName ?? ""; OldName = accountRepository.GetEmployeeInfo(orderModel.HelpEnterId)?.EmployeeName ?? "";
} }
if (helpEnterId > 0) { if (helpEnterId > 0) {
NewName = accountRepository.GetEmployeeInfo(helpEnterId)?.EmployeeName ?? ""; var teacherModel = accountRepository.GetEmployeeInfo(helpEnterId);
if (teacherModel.AccountType != Common.Enum.User.AccountTypeEnum.Teacher) { return "所选账号不是教师端,无法关联"; }
NewName = teacherModel?.EmployeeName ?? "";
} }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Order.HelpEnterId),helpEnterId} { nameof(RB_Order.HelpEnterId),helpEnterId}
......
...@@ -314,7 +314,9 @@ namespace Edu.Module.Course ...@@ -314,7 +314,9 @@ namespace Edu.Module.Course
z.OrderGuestId, z.OrderGuestId,
z.GuestName, z.GuestName,
z.CurrentDeductionHours, z.CurrentDeductionHours,
z.CheckStatus z.StudyNum,
z.CheckStatus,
z.ClassTimeId
}) })
}); });
return RList; return RList;
......
...@@ -360,7 +360,7 @@ WHERE 1=1 AND A.Status=0 "); ...@@ -360,7 +360,7 @@ WHERE 1=1 AND A.Status=0 ");
} }
if (query.CheckStatus > 0) if (query.CheckStatus > 0)
{ {
builder.AppendFormat(" AND C.{0}={1} ", nameof(RB_Class_Check_ViewModel.CheckStatus), query.CheckStatus); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.CheckStatus), query.CheckStatus);
} }
if (!string.IsNullOrEmpty(query.Q_ClassIds)) if (!string.IsNullOrEmpty(query.Q_ClassIds))
{ {
......
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