diff --git a/src/main/java/com/jsl/oa/model/voData/UserEditProfile.java b/src/main/java/com/jsl/oa/model/voData/UserEditProfile.java
index c34c6b8..a5dd8c5 100644
--- a/src/main/java/com/jsl/oa/model/voData/UserEditProfile.java
+++ b/src/main/java/com/jsl/oa/model/voData/UserEditProfile.java
@@ -1,10 +1,12 @@
 package com.jsl.oa.model.voData;
 
 import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
+@Setter
 @Getter
 public class UserEditProfile {
     private Long id;
diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
index 86d020c..b8b6932 100644
--- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
@@ -10,6 +10,7 @@ import com.jsl.oa.utils.BaseResponse;
 import com.jsl.oa.utils.ErrorCode;
 import com.jsl.oa.utils.ResultUtil;
 import lombok.RequiredArgsConstructor;
+import org.mindrot.jbcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -44,6 +45,9 @@ public class UserServiceImpl implements UserService {
     @Override
     public BaseResponse userEditProfile(UserEditProfile userEditProfile) {
         if(userDAO.isExistUser(userEditProfile.getId())) {
+            if(userEditProfile.getPassword()!=null){
+                userEditProfile.setPassword(BCrypt.hashpw(userEditProfile.getPassword(), BCrypt.gensalt()));
+            }
             userDAO.userEditProfile(userEditProfile);
             return ResultUtil.success("修改成功");
         }else return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
diff --git a/src/main/resources/com/jsl/oa/mapper/UserMapper.xml b/src/main/resources/com/jsl/oa/mapper/UserMapper.xml
index 36b6fcd..2993033 100644
--- a/src/main/resources/com/jsl/oa/mapper/UserMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/UserMapper.xml
@@ -7,37 +7,37 @@
     <update id="userEditProfile">
         update organize_oa.oa_user
         <set>
-            <if test="username != null">
+            <if test="username != null and username != ''">
                 username = #{username},
             </if>
-            <if test="password != null">
+            <if test="password != null and password != ''">
                 password = #{password},
             </if>
-            <if test="address != null">
+            <if test="address != null and address != ''">
                 address = #{address},
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone != ''">
                 phone = #{phone},
             </if>
-            <if test="email != null">
+            <if test="email != null and email != ''">
                 email = #{email},
             </if>
-            <if test="age != null">
+            <if test="age != null and age != ''">
                 age = #{age},
             </if>
-            <if test="signature != null">
+            <if test="signature != null and signature != ''">
                 signature = #{signature},
             </if>
-            <if test="sex != null">
+            <if test="sex != null and sex != ''">
                 sex = #{sex},
             </if>
-            <if test="avatar != null">
+            <if test="avatar != null and avatar != ''">
                 avatar = #{avatar},
             </if>
-            <if test="nickname != null">
+            <if test="nickname != null and nickname != ''">
                 nickname = #{nickname},
             </if>
-            <if test="description != null">
+            <if test="description != null and description != ''">
                 description = #{description}
             </if>
         </set>