diff --git a/src/main/java/com/jsl/oa/controllers/UserController.java b/src/main/java/com/jsl/oa/controllers/UserController.java
index 4ca7d8f..ca9eae9 100644
--- a/src/main/java/com/jsl/oa/controllers/UserController.java
+++ b/src/main/java/com/jsl/oa/controllers/UserController.java
@@ -56,12 +56,12 @@ public class UserController {
      * @return {@link BaseResponse}
      */
     @PutMapping("/user/lock")
-    public BaseResponse userLock(HttpServletRequest request,@RequestParam Long id) {
+    public BaseResponse userLock(HttpServletRequest request,@RequestParam Long id,@RequestParam Long isLock) {
         // 判断是否有参数错误
         if (id == null) {
             return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
         }
-        return userService.userLock(request,id);
+        return userService.userLock(request,id,isLock);
     }
 
     /**
diff --git a/src/main/java/com/jsl/oa/dao/UserDAO.java b/src/main/java/com/jsl/oa/dao/UserDAO.java
index 78eb1bd..9e772b9 100755
--- a/src/main/java/com/jsl/oa/dao/UserDAO.java
+++ b/src/main/java/com/jsl/oa/dao/UserDAO.java
@@ -69,8 +69,8 @@ public class UserDAO {
      *
      * @param id
      */
-    public void userLock(Long id) {
-        userMapper.userLock(id);
+    public void userLock(Long id,Long isLock) {
+        userMapper.userLock(id,isLock);
     }
 
     public void userEditProfile(UserEditProfileVO userEditProfileVO) {
diff --git a/src/main/java/com/jsl/oa/mapper/UserMapper.java b/src/main/java/com/jsl/oa/mapper/UserMapper.java
index 2176e8b..043bc5c 100755
--- a/src/main/java/com/jsl/oa/mapper/UserMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/UserMapper.java
@@ -30,8 +30,8 @@ public interface UserMapper {
     @Update("UPDATE organize_oa.oa_user SET enabled = 0 ,updated_at = CURRENT_TIMESTAMP WHERE id = #{id}  ")
     void userDelete(Long id);
 
-    @Update("UPDATE organize_oa.oa_user SET account_no_locked = 0 ,updated_at = CURRENT_TIMESTAMP WHERE id = #{id}  ")
-    void userLock(Long id);
+    @Update("UPDATE organize_oa.oa_user SET account_no_locked = #{isLock} ,updated_at = CURRENT_TIMESTAMP WHERE id = #{id}  ")
+    void userLock(Long id,Long isLock);
 
     @Select("SELECT * FROM organize_oa.oa_user WHERE id = #{id}")
     UserDO getUserById(Long id);
diff --git a/src/main/java/com/jsl/oa/services/UserService.java b/src/main/java/com/jsl/oa/services/UserService.java
index 0361e35..6078082 100755
--- a/src/main/java/com/jsl/oa/services/UserService.java
+++ b/src/main/java/com/jsl/oa/services/UserService.java
@@ -46,7 +46,7 @@ public interface UserService {
      * @param id 用户id
      * @return {@link BaseResponse}
      */
-    BaseResponse userLock(HttpServletRequest request,Long id);
+    BaseResponse userLock(HttpServletRequest request,Long id,Long isLock);
 
     /**
      * <h2>用户编辑自己的信息</h2>
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 829d195..3cce3d8 100755
--- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
@@ -44,14 +44,14 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public BaseResponse userLock(HttpServletRequest request, Long id) {
+    public BaseResponse userLock(HttpServletRequest request, Long id,Long isLock) {
         if (!Processing.checkUserIsAdmin(request, roleMapper)) {
             return ResultUtil.error(ErrorCode.NOT_ADMIN);
         }
         //判断用户是否存在
         if (userDAO.isExistUser(id)) {
-            userDAO.userLock(id);
-            return ResultUtil.success("锁定成功");
+            userDAO.userLock(id,isLock);
+            return ResultUtil.success("更改成功");
         } else return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
     }