From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 15:03:10 +0800
Subject: [PATCH] 2.0bug修改

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
index 6d8c8c8..035e8c7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
@@ -17,7 +17,8 @@
         <result column="emergencyContact" property="emergencyContact"/>
         <result column="emergencyContactNumber" property="emergencyContactNumber"/>
         <result column="isAuth" property="isAuth"/>
-        <result column="name" property="name"/>
+        <result column="lastName" property="lastName"/>
+        <result column="firstName" property="firstName"/>
         <result column="idCard" property="idCard"/>
         <result column="idCardFront" property="idCardFront"/>
         <result column="idCardReverse" property="idCardReverse"/>
@@ -50,15 +51,18 @@
         id as id,
         registIp as registIp,
         registAreaCode as registAreaCode,
+        phoneOperator as phoneOperator,
         phone as phone,
         nickName as nickName,
         avatar as avatar,
         birthday as birthday,
         sex as sex,
+        email,
         emergencyContact as emergencyContact,
         emergencyContactNumber as emergencyContactNumber,
         isAuth as isAuth,
-        name as name,
+        lastName as lastName,
+        firstName as firstName,
         idCard as idCard,
         idCardFront as idCardFront,
         idCardReverse as idCardReverse,
@@ -84,15 +88,18 @@
         id as id,
         registIp as registIp,
         registAreaCode as registAreaCode,
+        phoneOperator as phoneOperator,
         phone as phone,
         nickName as nickName,
         avatar as avatar,
         birthday as birthday,
         sex as sex,
+        email,
         emergencyContact as emergencyContact,
         emergencyContactNumber as emergencyContactNumber,
         isAuth as isAuth,
-        name as name,
+        lastName as lastName,
+        firstName as firstName,
         idCard as idCard,
         idCardFront as idCardFront,
         idCardReverse as idCardReverse,
@@ -119,15 +126,18 @@
         id as id,
         registIp as registIp,
         registAreaCode as registAreaCode,
+        phoneOperator as phoneOperator,
         phone as phone,
         nickName as nickName,
         avatar as avatar,
         birthday as birthday,
         sex as sex,
+        email,
         emergencyContact as emergencyContact,
         emergencyContactNumber as emergencyContactNumber,
         isAuth as isAuth,
-        name as name,
+        lastName as lastName,
+        firstName as firstName,
         idCard as idCard,
         idCardFront as idCardFront,
         idCardReverse as idCardReverse,
@@ -156,15 +166,18 @@
         id as id,
         registIp as registIp,
         registAreaCode as registAreaCode,
+        phoneOperator as phoneOperator,
         phone as phone,
         nickName as nickName,
         avatar as avatar,
         birthday as birthday,
         sex as sex,
+        email,
         emergencyContact as emergencyContact,
         emergencyContactNumber as emergencyContactNumber,
         isAuth as isAuth,
-        name as name,
+        lastName as lastName,
+        firstName as firstName,
         idCard as idCard,
         idCardFront as idCardFront,
         idCardReverse as idCardReverse,
@@ -191,15 +204,17 @@
     <select id="queryUserInfo" resultType="map">
         select
         a.id as id,
+        a.phoneOperator as phoneOperator,
         a.phone as phone,
         a.email as email,
+        a.lastName as lastName,
+        a.firstName as firstName,
         a.nickName as nickName,
         a.avatar as avatar,
         DATE_FORMAT(a.birthday, '%Y-%m-%d') as birthday,
         a.sex as sex,
         a.isAuth as isAuth,
         (select state from t_verified where userId = a.id order by insertTime desc limit 0,1) as verified,
-        a.name as name,
         a.integral as integral,
         a.emergencyContact as emergencyContact,
         a.emergencyContactNumber as emergencyContactNumber,
@@ -224,7 +239,8 @@
         select
         id as id,
         userId as userId,
-        name as name,
+        lastName as lastName,
+        firstName as firstName,
         idcode as idcode,
         img1 as img1,
         img2 as img2,
@@ -235,8 +251,9 @@
     <select id="queryMyInviteUserList" resultType="map">
         select
             id as id,
+            phoneOperator as phoneOperator,
             phone as phone,
-            IFNULL(name,nickName) as name,
+            IFNULL(lastName,nickName) as name,
             avatar as avatar,
             DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
         from t_user

--
Gitblit v1.7.1