From 5467d5e424386a47bac5986aab393c1a8b01d8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=9D=A1=E8=A7=89=E7=9A=84=E6=9C=88=E4=BA=AE?=
 <97796069+Cookies-OvO@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:52:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=93=8D=E5=BA=94=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0tenantName=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAcompanyName=E7=94=A8=E6=88=B7=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yzt/common/response/StorePinkAdminListResponse.java    | 4 ++--
 .../com/yzt/common/response/UserSearchAdminResponse.java   | 4 ++--
 .../com/yzt/service/service/impl/StorePinkServiceImpl.java | 2 +-
 .../src/main/resources/mapper/user/UserMapper.xml          | 7 +++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java
index dea2a33..0e43ea9 100644
--- a/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java
+++ b/fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java
@@ -56,8 +56,8 @@ public class StorePinkAdminListResponse {
     @ApiModelProperty(value = "客户姓名")
     private String name;
 
-    @ApiModelProperty("租户名称")
-    private String tenantName;
+    @ApiModelProperty("用户公司名称")
+    private String companyName;
 
     @ApiModelProperty(value = "当前队列的排队序号")
     private Integer queueNo;
diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java
index 2f31119..dfda3a6 100644
--- a/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java
+++ b/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java
@@ -18,6 +18,6 @@ public class UserSearchAdminResponse {
     @ApiModelProperty(value = "手机号码")
     private String phone;
 
-    @ApiModelProperty(value = "企业名称")
-    private String tenantName;
+    @ApiModelProperty(value = "用户公司名称")
+    private String companyName;
 }
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
index 97a7410..8aa2a76 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java
@@ -240,7 +240,7 @@ public class StorePinkServiceImpl extends ServiceImpl<StorePinkMapper, StorePink
             if (null != user) {
                 storePinkResponse.setPhone(user.getPhone());
                 storePinkResponse.setName(user.getNickname());
-                storePinkResponse.setTenantName(tenantService.getInfo(user.getTenantId()).getTenantName());
+                storePinkResponse.setCompanyName(user.getCompanyName());
             }
             return storePinkResponse;
         }).collect(Collectors.toList());
diff --git a/fightwine-service/src/main/resources/mapper/user/UserMapper.xml b/fightwine-service/src/main/resources/mapper/user/UserMapper.xml
index 26757d9..3cb29fd 100644
--- a/fightwine-service/src/main/resources/mapper/user/UserMapper.xml
+++ b/fightwine-service/src/main/resources/mapper/user/UserMapper.xml
@@ -96,20 +96,19 @@
         ORDER BY u.uid desc
     </select>
 
-    <!-- 后台管理用户搜索：通过手机号或企业名称模糊查询 -->
+    <!-- 后台管理用户搜索：通过手机号或公司名称模糊查询 -->
     <select id="searchUsersByPhoneOrTenant" resultType="com.yzt.common.response.UserSearchAdminResponse" parameterType="String">
         SELECT 
             u.uid,
             u.nickname,
             u.phone,
-            t.tenant_name AS tenantName
+            u.company_name AS companyName
         FROM zp_user AS u
-        LEFT JOIN zp_tenant AS t ON u.tenant_id = t.tenant_id
         WHERE 1 = 1
         <if test="keyword != null and keyword != ''">
             AND (
                 u.phone LIKE CONCAT('%', #{keyword}, '%')
-                OR t.tenant_name LIKE CONCAT('%', #{keyword}, '%')
+                OR u.company_name LIKE CONCAT('%', #{keyword}, '%')
             )
         </if>
         ORDER BY u.uid DESC