|
|
@@ -136,7 +136,8 @@
|
|
|
psd.id as pDeptId,
|
|
|
psd.name as pDeptName,
|
|
|
su.create_time as submitTime,
|
|
|
- sut.approveTime as approveTime
|
|
|
+ (select approve_by from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
|
|
|
+ (select approve_time from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveTime
|
|
|
FROM
|
|
|
sys_user su
|
|
|
LEFT JOIN sys_user_info info ON info.id = su.id
|
|
|
@@ -144,8 +145,6 @@
|
|
|
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
|
|
|
AND sd.del_flag = '0'
|
|
|
WHERE
|
|
|
1=1
|
|
|
@@ -1352,19 +1351,19 @@
|
|
|
|
|
|
<select id="getByIdsList" resultType="com.ydtech.modules.admin.model.dto.QxFrontlineAgentDto">
|
|
|
SELECT
|
|
|
- su.name as "name",
|
|
|
- sd.name as "deptName",
|
|
|
- su.id as "userId",
|
|
|
- su.dept_id as "deptId"
|
|
|
+ su.name as "name",
|
|
|
+ sd.name as "deptName",
|
|
|
+ su.id as "userId",
|
|
|
+ su.dept_id as "deptId"
|
|
|
FROM
|
|
|
- sys_user su
|
|
|
- LEFT JOIN sys_dept sd ON sd.id = su.dept_id
|
|
|
+ sys_user su
|
|
|
+ LEFT JOIN sys_dept sd ON sd.id = su.dept_id
|
|
|
<where>
|
|
|
- su.id LIKE '%M%'
|
|
|
+ su.id LIKE '%M%'
|
|
|
and su.status = '1'
|
|
|
<if test="vo.ids != null and vo.ids.size()>0 ">
|
|
|
AND su.id IN
|
|
|
- <foreach item="item" collection="vo.ids" open="(" separator="," close=")">
|
|
|
+ <foreach item="item" collection="vo.ids" open="(" separator="," close=")">
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
wks