bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysUser.java

@@ -65,6 +65,9 @@ public class SysUser extends BaseEntity implements Serializable {
      */
     private String remark;
 
+    @TableField(exist = false)
+    private String oldPassword;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private Long[] roleIds;
@@ -168,4 +171,12 @@ public class SysUser extends BaseEntity implements Serializable {
     public void setCourseIds(Long[] courseIds) {
         this.courseIds = courseIds;
     }
+
+    public String getOldPassword() {
+        return oldPassword;
+    }
+
+    public void setOldPassword(String oldPassword) {
+        this.oldPassword = oldPassword;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysUserService.java

@@ -27,7 +27,7 @@ public interface SysUserService extends IService<SysUser> {
 
     boolean resetPassword(Long id);
 
-    boolean updatePassword(Long id, String oldPassword, String password);
+    boolean updatePassword(SysUser user);
 
     boolean bindRoles(SysUser sysUser);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -182,18 +182,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public boolean updatePassword(Long id, String oldPassword, String password) {
-        SysUser sysUser = this.getById(id);
+    public boolean updatePassword(SysUser user) {
+        SysUser sysUser = this.getById(user.getId());
         if (sysUser == null) {
             throw ExceptionResultEnum.ERROR.exception("用户不存在");
         }
-
-        oldPassword = Md5Utils.toMd5Hex(oldPassword);
-        if (!StringUtils.equals(sysUser.getPassword(), oldPassword)) {
+        if (!StringUtils.equals(sysUser.getPassword(), user.getOldPassword())) {
             throw ExceptionResultEnum.ERROR.exception("原密码不正确");
         }
-        String md5Password = Md5Utils.toMd5Hex(password);
-        sysUser.setPassword(md5Password);
+        sysUser.setPassword(user.getPassword());
         return this.updateById(sysUser);
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -153,10 +153,8 @@ public class SysUserController {
      */
     @ApiOperation(value = "修改密码")
     @RequestMapping(value = "/update_password", method = RequestMethod.POST)
-    public Result updatePassword(@RequestParam(value = "id") Long id,
-                                 @RequestParam(value = "oldPassword") String oldPassword,
-                                 @RequestParam(value = "password") String password) {
-        boolean isSuccess = sysUserService.updatePassword(id, oldPassword, password);
+    public Result updatePassword(@RequestBody SysUser user) {
+        boolean isSuccess = sysUserService.updatePassword(user);
         return ResultUtil.ok(isSuccess);
     }