diff --git a/src/main/java/vvpkassistant/User/service/UserServiceImpl.java b/src/main/java/vvpkassistant/User/service/UserServiceImpl.java
index c19481c..e4f0db4 100644
--- a/src/main/java/vvpkassistant/User/service/UserServiceImpl.java
+++ b/src/main/java/vvpkassistant/User/service/UserServiceImpl.java
@@ -85,7 +85,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
             throw new BusinessException(ErrorCode.USER_DOES_NOT_EXIST);
         }
 //        用户没有密码的情况下设置密码
-        if (userInfo.getPassword() == null) {
+        if (userInfo.getPassword() == null && userModelDTO.getNewPassword() != null) {
             if (!userModelDTO.getNewPassword().isEmpty()){
                 if (userModelDTO.getNewPassword().length()<6){
                     throw new BusinessException(ErrorCode.PARAMS_ERROR,"密码长度不能小于 6 位");
@@ -106,12 +106,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
             }
         }
 
-        UserModel userModel = new UserModel();
-        BeanUtil.copyProperties(userModelDTO, userModel);
+        UserModel userModel = BeanUtil.copyProperties(userModelDTO, UserModel.class);
         int i = userDao.updateById(userModel);
         // 返回结果
-        userDao.selectById(userModel.getId());
-        UserModelVO userModelVO = BeanUtil.copyProperties(userModel, UserModelVO.class);
+        UserModel afterUserInfo = userDao.selectById(userModel.getId());
+        UserModelVO userModelVO = BeanUtil.copyProperties(afterUserInfo, UserModelVO.class);
         userModelVO.setNewAccount(false);
         if (i == 1){
            return userModelVO;