Merge remote-tracking branch 'origin/master'

fightwine-common/src/main/java/com/yzt/common/response/StorePinkAdminListResponse.java

@@ -56,8 +56,8 @@ public class StorePinkAdminListResponse {
     @ApiModelProperty(value = "客户姓名")
     private String name;
 
-    @ApiModelProperty("租户名称")
+    @ApiModelProperty("用户公司名称")
-    private String tenantName;
+    private String companyName;
 
     @ApiModelProperty(value = "当前队列的排队序号")
     private Integer queueNo;

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 = "企业名称")
+    @ApiModelProperty(value = "用户公司名称")
-    private String tenantName;
+    private String companyName;
 }

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());

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