|
|
|
|
164
|
cmcUserHistory.setPostLevel(sysUser.getPostLevel());
|
164
|
cmcUserHistory.setPostLevel(sysUser.getPostLevel());
|
165
|
cmcUserHistory.setSalaryLevel(sysUser.getSalaryLevel());
|
165
|
cmcUserHistory.setSalaryLevel(sysUser.getSalaryLevel());
|
166
|
cmcUserHistory.setPmLevel(sysUser.getPmLevel());
|
166
|
cmcUserHistory.setPmLevel(sysUser.getPmLevel());
|
167
|
- cmcUserHistory.setUpdateReason(sysUser.getUpdateReason());
|
|
|
|
|
167
|
+ cmcUserHistory.setUpdateReason(user.getUpdateReason());
|
168
|
cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
|
168
|
cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
|
169
|
cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory);
|
169
|
cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory);
|
170
|
userService.checkUserAllowed(user);
|
170
|
userService.checkUserAllowed(user);
|
|
|
|
|
182
|
return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
182
|
return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
183
|
}
|
183
|
}
|
184
|
user.setUpdateBy(getUsername());
|
184
|
user.setUpdateBy(getUsername());
|
|
|
185
|
+ user.setUpdateReason(user.getUpdateReason());
|
185
|
return toAjax(userService.updateUser(user));
|
186
|
return toAjax(userService.updateUser(user));
|
186
|
}
|
187
|
}
|
187
|
|
188
|
|