记录用户修改历史

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -156,6 +156,17 @@ public class SysUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
+        CmcUserHistory cmcUserHistory = new CmcUserHistory();
+        SysUser sysUser = userService.selectUserById(user.getUserId());
+        cmcUserHistory.setUserId(user.getUserId());
+        cmcUserHistory.setTitiles(sysUser.getTitles());
+        cmcUserHistory.setEngineerLevel(sysUser.getEngineerLevel());
+        cmcUserHistory.setPostLevel(sysUser.getPostLevel());
+        cmcUserHistory.setSalaryLevel(sysUser.getSalaryLevel());
+        cmcUserHistory.setPmLevel(sysUser.getPmLevel());
+        cmcUserHistory.setUpdateReason(sysUser.getUpdateReason());
+        cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
+        cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory);
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         if (!userService.checkUserNameUnique(user))
@@ -174,27 +185,6 @@ public class SysUserController extends BaseController
         return toAjax(userService.updateUser(user));
     }
 
-    /**
-     * 修改用户
-     */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/addHistory")
-    public AjaxResult addHistory(@Validated @RequestBody SysUser user)
-    {
-        CmcUserHistory cmcUserHistory = new CmcUserHistory();
-        cmcUserHistory.setUserId(user.getUserId());
-        cmcUserHistory.setTitiles(user.getTitles());
-        cmcUserHistory.setEngineerLevel(user.getEngineerLevel());
-        cmcUserHistory.setPostLevel(user.getPostLevel());
-        cmcUserHistory.setSalaryLevel(user.getSalaryLevel());
-        cmcUserHistory.setPmLevel(user.getPmLevel());
-        cmcUserHistory.setUpdateReason(user.getUpdateReason());
-        cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
-        cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory);
-        return toAjax(cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory));
-    }
-
     /**
      * 删除用户
      */