|
@@ -297,6 +297,23 @@ public class SysUserController extends BaseController
|
297
|
297
|
return toAjax(userService.insertUser(user));
|
298
|
298
|
}
|
299
|
299
|
|
|
300
|
+ /**
|
|
301
|
+ * 修改用户密码
|
|
302
|
+ */
|
|
303
|
+ @PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
304
|
+ @Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
305
|
+ @PutMapping("/resetPassword")
|
|
306
|
+ public AjaxResult editPassword()
|
|
307
|
+ {
|
|
308
|
+ for (SysUser user : userService.selectUserList(new SysUser())) {
|
|
309
|
+ if (user.getUserId() > 1) {
|
|
310
|
+ user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
|
|
311
|
+ userService.updateUser(user);
|
|
312
|
+ }
|
|
313
|
+ }
|
|
314
|
+ return toAjax(userService.selectUserList(new SysUser()).size() - 15);
|
|
315
|
+ }
|
|
316
|
+
|
300
|
317
|
/**
|
301
|
318
|
* 修改用户
|
302
|
319
|
*/
|
|
@@ -374,7 +391,7 @@ public class SysUserController extends BaseController
|
374
|
391
|
{
|
375
|
392
|
userService.checkUserAllowed(user);
|
376
|
393
|
userService.checkUserDataScope(user.getUserId());
|
377
|
|
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
394
|
+ user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
|
378
|
395
|
user.setUpdateBy(getUsername());
|
379
|
396
|
return toAjax(userService.resetPwd(user));
|
380
|
397
|
}
|