diff --git a/modules/user/controller/user_controller.go b/modules/user/controller/user_controller.go
index 45e4ea8..a3c57e7 100644
--- a/modules/user/controller/user_controller.go
+++ b/modules/user/controller/user_controller.go
@@ -108,9 +108,9 @@ func (c *userController) Register(ctx *gin.Context) {
 // @Failure      400   {object}  map[string]interface{}
 // @Router       /users [get]
 func (c *userController) GetAllUser(ctx *gin.Context) {
-	clientId := ctx.MustGet("client_id").(string)
+	// clientId := ctx.MustGet("client_id").(string)
 	var filter = &query.UserFilter{
-		ClientID: clientId,
+		ClientID: ctx.Query("client_id"),
 		Name:     ctx.Query("name"),
 		Includes: []string{"Roles"},
 	}
@@ -284,8 +284,8 @@ func (c *userController) Update(ctx *gin.Context) {
 		return
 	}
 
-	userId := ctx.MustGet("user_id").(string)
-	result, err := c.userService.Update(ctx.Request.Context(), req, userId)
+	id := ctx.Param("id")
+	result, err := c.userService.Update(ctx.Request.Context(), req, id)
 	if err != nil {
 		res := utils.BuildResponseFailed(dto.MESSAGE_FAILED_UPDATE_USER, err.Error(), nil)
 		ctx.JSON(http.StatusBadRequest, res)
@@ -307,9 +307,9 @@ func (c *userController) Update(ctx *gin.Context) {
 // @Failure      400   {object}  map[string]interface{}
 // @Router       /users [delete]
 func (c *userController) Delete(ctx *gin.Context) {
-	userId := ctx.MustGet("user_id").(string)
+	id := ctx.Param("id")
 
-	if err := c.userService.Delete(ctx.Request.Context(), userId); err != nil {
+	if err := c.userService.Delete(ctx.Request.Context(), id); err != nil {
 		res := utils.BuildResponseFailed(dto.MESSAGE_FAILED_DELETE_USER, err.Error(), nil)
 		ctx.AbortWithStatusJSON(http.StatusBadRequest, res)
 		return