From e8c3309813bd9ed7ac9ea7b10332325424a4846e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Tue, 10 Dec 2024 11:27:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8C=85=E5=8F=B0=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=8A=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/invest/domain/vo/IUserVo.java   |  1 +
 .../resources/mapper/invest/IUserMapper.xml   | 38 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java
index 2cffc5d..ba21905 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java
@@ -13,5 +13,6 @@ import io.swagger.annotations.ApiModel;
 @Data
 public class IUserVo extends IUser
 {
+    private String shopName;
 
 }
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml
index cfd2f81..a37f9b8 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml
@@ -33,10 +33,44 @@
         <result property="districtName"    column="district_name"    />
         <result property="userName"    column="user_name"    />
         <result property="itemName"    column="item_name"    />
+        <result property="shopName"    column="shop_name"    />
     </resultMap>
 
     <sql id="selectIUserVo">
-        select a.mobile, a.user_id,a.district_name,a.user_name,a.item_name, a.token, a.cookie, a.device_id, a.item_code, a.ishop_id, a.province_name, a.city_name, a.address, a.lat, a.lng, a.minute, a.shop_type, a.random_minute, a.push_plus_token, a.json_result, a.remark, a.expire_time, a.del_flag, a.create_time, a.create_user, a.update_time, a.update_user, a.create_by from i_user a
+        select
+            a.mobile,
+            a.user_id,
+            a.district_name,
+            a.user_name,
+            a.item_name,
+            a.token,
+            a.cookie,
+            a.device_id,
+            a.item_code,
+            a.ishop_id,
+            a.province_name,
+            a.city_name,
+            a.address,
+            a.lat,
+            a.lng,
+            a.minute,
+            a.shop_type,
+            a.random_minute,
+            a.push_plus_token,
+            a.json_result,
+            a.remark,
+            a.expire_time,
+            a.del_flag,
+            a.create_time,
+            a.create_user,
+            a.update_time,
+            a.update_user,
+            a.create_by,
+            is2."name"  as shop_name
+        from
+            i_user a
+                left join i_shop is2 on is2.i_shop_id =a.ishop_id
+
     </sql>
 
     <select id="selectIUserList" parameterType="IUserDto" resultMap="IUserResult">
@@ -132,7 +166,7 @@
             <if test="updateUser != null">#{updateUser},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="districtName != null">#{districtName},</if>
-            <if test="userName != null">#{createBy},</if>
+            <if test="userName != null">#{userName},</if>
             <if test="itemName != null">#{itemName},</if>
         </trim>
     </insert>