From ea719b0443b8ccbc6d17349796936664ff3261d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 二月 2023 19:04:43 +0800
Subject: [PATCH] 修改bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml |   27 +++++++++++++++++++--------
 1 files changed, 19 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..ab62b3d 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"/>
@@ -55,10 +56,12 @@
         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,
@@ -89,10 +92,12 @@
         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,
@@ -124,10 +129,12 @@
         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,
@@ -161,10 +168,12 @@
         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,
@@ -193,13 +202,14 @@
         a.id as id,
         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 +234,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,
@@ -236,7 +247,7 @@
         select
             id as id,
             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