|
@@ -22,9 +22,9 @@
|
|
|
tffl.task_id as taskId,
|
|
|
(
|
|
|
select
|
|
|
- group_concat(su.real_name)
|
|
|
+ group_concat(su.real_name,'(',so.name,')')
|
|
|
from
|
|
|
- sys_user su
|
|
|
+ sys_user su join sys_org so on so.id = su.org_id
|
|
|
where
|
|
|
FIND_IN_SET(su.id,replace(tffl.pend_approve_id,', ',','))) as pendApproveUserName
|
|
|
from
|
|
@@ -34,9 +34,9 @@
|
|
|
et.user_id as teacherId,
|
|
|
(
|
|
|
select
|
|
|
- su.real_name
|
|
|
+ CONCAT(su.real_name,'(',so.name,')')
|
|
|
from
|
|
|
- sys_user su
|
|
|
+ sys_user su join sys_org so on so.id = su.org_id
|
|
|
where
|
|
|
su.id = et.user_id) as teacherUserName,
|
|
|
tffa.create_time as createTime,
|