|
|
@ -79,7 +79,7 @@ FROM (SELECT A.*, |
|
|
|
if (!string.IsNullOrWhiteSpace(condition)) |
|
|
|
if (!string.IsNullOrWhiteSpace(condition)) |
|
|
|
conditions += " AND " + condition; |
|
|
|
conditions += " AND " + condition; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
conditions += $" AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1"; |
|
|
|
if (filter.jsonParam != null) |
|
|
|
if (filter.jsonParam != null) |
|
|
|
foreach (JProperty jProperty in filter.jsonParam.Properties()) |
|
|
|
foreach (JProperty jProperty in filter.jsonParam.Properties()) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -155,7 +155,7 @@ FROM (SELECT A.*, |
|
|
|
x.TeacherTypeLabel = await GetParaLabel("TrainingTeacherType", x.TeacherType); |
|
|
|
x.TeacherTypeLabel = await GetParaLabel("TrainingTeacherType", x.TeacherType); |
|
|
|
x.TeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.TeacherLevel); |
|
|
|
x.TeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.TeacherLevel); |
|
|
|
x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == x.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == x.DeptID)?.DeptName; |
|
|
|
x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == x.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == x.DeptID)?.DeptName; |
|
|
|
|
|
|
|
x.DataBelongName = await GetDataBelongName(x.DataBelongID); |
|
|
|
}); |
|
|
|
}); |
|
|
|
return data; |
|
|
|
return data; |
|
|
|
} |
|
|
|
} |
|
|
|