|
|
@@ -257,8 +257,8 @@
|
|
|
left join sys_dept psd on psd.id = sd.parent_id
|
|
|
LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
|
|
|
LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
|
- left join (select user_id, MAX(approve_time) approveTime
|
|
|
- from sys_user_track group by user_id ) sut on sut.user_id = su.id
|
|
|
+ left join (select user_id, approve_by, MAX(approve_time) approveTime
|
|
|
+ from sys_user_track group by user_id, approve_by) sut on sut.user_id = su.id
|
|
|
AND sd.del_flag = '0'
|
|
|
WHERE
|
|
|
1=1
|