diff --git a/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java b/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
index ec2b289..54a8ffe 100644
--- a/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
+++ b/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
@@ -87,9 +87,8 @@ public class WorkspaceController {
     }
 
     @GetMapping("/{workspaceId}/member")
-    public R getMember(@PathVariable String workspaceId) {
-
-        Map params  = T.MapUtil.builder("workspaceId", workspaceId).build();
+    public R getMember(@PathVariable String workspaceId, @RequestParam Map params) {
+        params.put("workspaceId", workspaceId);
         List<WorkspaceMemberEntity> memberEntityList = workspaceMemberService.queryList(params);
         return R.ok().putData("records", memberEntityList);
     }
diff --git a/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml b/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
index f5ed9a2..9179407 100644
--- a/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
+++ b/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
@@ -19,6 +19,7 @@
         <association property="user" columnPrefix="su_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
 
         <association property="role" columnPrefix="sr_" javaType="net.geedge.asw.module.sys.entity.SysRoleEntity">
@@ -40,6 +41,7 @@
         cu.user_name AS cu_user_name,
         su.id AS su_id,
         su.name AS su_name,
+        su.user_name AS su_user_name,
         sr.id AS sr_id,
         sr.name AS sr_name,
         ws.id AS w_id,
@@ -52,12 +54,16 @@
         LEFT JOIN workspace ws ON wm.workspace_id = ws.id
         <where>
             <if test="params.workspaceId != null and params.workspaceId != ''">
-                wm.workspace_id = #{params.workspaceId}
+                AND  wm.workspace_id = #{params.workspaceId}
             </if>
 
             <if test="params.userId != null and params.userId != ''">
-                wm.user_id = #{params.userId}
+                AND  wm.user_id = #{params.userId}
             </if>
+            <if test="params.q != null and params.q != ''">
+                AND ( locate(#{params.q}, su.name) OR locate(#{params.q}, su.user_name) )
+            </if>
+
         </where>
     </select>
 </mapper>
\ No newline at end of file