|
@@ -43,8 +43,7 @@
|
|
|
END AS supervisorType,
|
|
|
|
|
|
CASE
|
|
|
- WHEN su_supervisor.user_type = 5 AND su_supervisor.supervisor_id IS NOT NULL AND su_supervisor.supervisor_id != 0 THEN su_internalSupervisor.nickname
|
|
|
--- WHEN su_supervisor.user_type = 3 AND su_supervisor.external_supervisor_id IS NOT NULL AND su_supervisor.external_supervisor_id != 0 THEN su_externalSupervisor.nickname
|
|
|
+ WHEN su_supervisor.user_type = 5 AND su_student.supervisor_id IS NOT NULL AND su_student.supervisor_id != 0 THEN su_internalSupervisor.nickname
|
|
|
ELSE NULL
|
|
|
END AS workSupervisor
|
|
|
|
|
@@ -52,9 +51,7 @@
|
|
|
LEFT JOIN system_users su_student ON r.student_id = su_student.id
|
|
|
LEFT JOIN system_users su_supervisor ON r.supervisor_id = su_supervisor.id
|
|
|
-- 是校外的时候,这个连接的su_internalSupervisor代表校内导师
|
|
|
- LEFT JOIN system_users su_internalSupervisor ON su_supervisor.supervisor_id = su_internalSupervisor.id
|
|
|
--- -- 是校内的时候,这个连接的su_externalSupervisor代表校外导师
|
|
|
--- LEFT JOIN system_users su_externalSupervisor ON su_supervisor.external_supervisor_id = su_externalSupervisor.id
|
|
|
+ LEFT JOIN system_users su_internalSupervisor ON su_student.supervisor_id = su_internalSupervisor.id
|
|
|
|
|
|
LEFT JOIN supervisor_selection_setting supervisor_setting ON r.supervisor_id = supervisor_setting.supervisor_id
|
|
|
|