时间修改

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -489,7 +489,6 @@ public class SysUserController extends BaseController {
             sysUser.setStatus(UserWorkStatus.UWS_7.getCode());
         }
 
-        sysUser.setApprovalOpinion(reason);
         SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
         sysUserTrack.setApproveMess(reason);
         sysUserTrackService.save(sysUserTrack);

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -88,16 +88,14 @@
         psd.name as pDeptName,
         t4.id as roleId,
         t4.name as roleName,
-        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_dept sd on su.dept_id=sd.id
         left join sys_dept psd on sd.parent_id=psd.id
         left join sys_user_info info on info.id=su.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
         where 1=1
         AND sd.id <> ''
         <if test='user !=null  '>
@@ -249,8 +247,8 @@
         psd.id as pDeptId,
         psd.name as pDeptName,
         su.create_time as submitTime,
-        sut.approveTime as approveTime,
-        sut.approve_by as approveBy
+        (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
@@ -258,8 +256,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, 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