人员修改

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -685,15 +685,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = sysUserVo.getSysUser();
         int beStatus = sysUser.getStatus();
         //如果审核驳回则 重新修改为 审核状态
-        if (sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_3.getCode()) {
+        if (sysUserVo.getSysUser().getStatus().equals(UserWorkStatus.UWS_3.getCode())) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_2.getCode());
         }
 
-        if (sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_5.getCode()) {
+        if (Objects.equals(sysUserVo.getSysUser().getStatus(), UserWorkStatus.UWS_5.getCode())) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_4.getCode());
         }
 
-        if (sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_7.getCode()) {
+        if (Objects.equals(sysUserVo.getSysUser().getStatus(), UserWorkStatus.UWS_7.getCode())
+                || Objects.equals(sysUserVo.getSysUser().getStatus(), UserWorkStatus.UWS_1.getCode())) {
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_6.getCode());
         }
 
@@ -727,7 +728,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return checkChuDanUser(sysUser);
         }
 
-        sysUser.setStatus(UserWorkStatus.UWS_6.getCode());
+        sysUser.setStatus(sysUserVo.getSysUser().getStatus());
         updateById(sysUser);
 
         //角色配置
@@ -765,14 +766,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserTrack sysUserTrack = new SysUserTrack();
             sysUserTrack.setUserId(sysUser.getId());
             SysUser user = BaseController.getUser();
-
             sysUserTrack.setApproveBy(user.getName());
             sysUserTrack.setApproveById(user.getId());
-
             sysUserTrack.setStatus(sysUserVo.getSysUser().getStatus());
             sysUserTrack.setApproveTime(new Date());
             sysUserTrackService.save(sysUserTrack);
         }
+
         return HttpResult.ok("修改成功");
     }
 

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

@@ -138,7 +138,8 @@
         psd.id as pDeptId,
         psd.name as pDeptName,
         su.create_time as submitTime,
-        sut.approveTime as approveTime
+        sut.approveTime as approveTime,
+        sut.approve_by as approveBy
         FROM
         sys_user su
         LEFT JOIN sys_user_info info ON info.id = su.id
@@ -146,8 +147,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
@@ -249,7 +250,7 @@
         psd.name as pDeptName,
         su.create_time as submitTime,
         sut.approveTime as approveTime,
-        sut.approve_by as approvBy
+        sut.approve_by as approveBy
         FROM
         sys_user su
         LEFT JOIN sys_user_info info ON info.id = su.id

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

@@ -6,16 +6,14 @@
         <result column="user_id" property="userId" javaType="java.lang.String"/>
         <result column="status" property="status" javaType="java.lang.Integer"/>
         <result column="approve_by" property="approveBy" javaType="java.lang.String"/>
+        <result column="approve_by_id" property="approveById" javaType="java.lang.String"/>
         <result column="approve_time" property="approveTime" javaType="java.util.Date"/>
         <result column="approve_mess" property="approveMess" javaType="java.lang.String"/>
     </resultMap>
-    <insert id="insert">
-        insert into sys_user_track (user_id,status,approve_by,approve_time,approve_mess)
-        values (#{userId},#{status},#{approveBy}, #{approveTime},#{approveMess})
-    </insert>
 
     <select id="getLastTime" resultMap="sysUserTrackMap">
         select  approve_by,approve_time from sys_user_track
         where user_id = #{userId} order by approve_time desc limit 1
     </select>
+
 </mapper>