diff --git a/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml
index 3b56e6b..6a9c88b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml
@@ -81,8 +81,12 @@
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
             <if test="password != null  and password != ''"> and password = #{password}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="nickname != null  and nickname != ''"> and nickname like concat('%', #{nickname}, '%')</if>
+            <if test="phone != null  and phone != ''">
+                or phone  like concat('%', #{phone}, '%')
+            </if>
+            <if test="nickname != null  and nickname != ''">
+             or nickname like concat('%', #{nickname}, '%')
+            </if>
             <if test="sex != null "> and sex = #{sex}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="addr != null  and addr != ''"> and addr = #{addr}</if>
diff --git a/ruoyi-ui/src/views/user/manage/index.vue b/ruoyi-ui/src/views/user/manage/index.vue
index a468f8a..b1ee0a4 100644
--- a/ruoyi-ui/src/views/user/manage/index.vue
+++ b/ruoyi-ui/src/views/user/manage/index.vue
@@ -105,6 +105,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        phone: null,
+        nickname: null,
         searchKey: null
       }
     };
@@ -139,11 +141,22 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      // 如果有搜索关键字，同时设置手机号和昵称参数
+      if (this.queryParams.searchKey) {
+        this.queryParams.phone = this.queryParams.searchKey;
+        this.queryParams.nickname = this.queryParams.searchKey;
+      } else {
+        this.queryParams.phone = null;
+        this.queryParams.nickname = null;
+      }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.phone = null;
+      this.queryParams.nickname = null;
+      this.queryParams.searchKey = null;
       this.handleQuery();
     },
     /** 状态修改 */