合并

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -225,7 +225,7 @@ public class TaUserController extends BaseController {
      * @return
      */
     @PutMapping(value = "/admin/update/password")
-    public ResponseBean updatePassword(
+    public ResponseBean updatePassword( @RequestParam String originalPassword,
                                         @RequestParam String newPassword,
                                         HttpServletRequest request) {
 
@@ -234,6 +234,14 @@ public class TaUserController extends BaseController {
         }
 
         Integer userId = getUserId(request);
+
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaUser taUser = iTaUserService.getById(userId);
+        if (!password.equals(taUser.getLoginPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         try {
             iTaUserService.resetPassword(userId, newPassword);
             return ResponseBean.success("操作成功！");