From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml |  101 ++++----------------------------------------------
 1 files changed, 9 insertions(+), 92 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
index ff4b93b..1ef67d2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
@@ -16,7 +16,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"/>
@@ -38,70 +39,14 @@
 
 
     <select id="queryByPhone" resultType="UserInfo">
-        select
-        id as id,
-        registIp as registIp,
-        registAreaCode as registAreaCode,
-        phone as phone,
-        nickName as nickName,
-        avatar as avatar,
-        birthday as birthday,
-        sex as sex,
-        emergencyContact as emergencyContact,
-        emergencyContactNumber as emergencyContactNumber,
-        isAuth as isAuth,
-        name as name,
-        idCard as idCard,
-        idCardFront as idCardFront,
-        idCardReverse as idCardReverse,
-        consumption as consumption,
-        balance as balance,
-        integral as integral,
-        passWord as passWord,
-        openId as openId,
-        appletsOpenId as appletsOpenId,
-        unionid as unionid,
-        state as state,
-        flag as flag,
-        insertTime as insertTime,
-        insertUser as insertUser,
-        updateTime as updateTime,
-        updateUser as updateUser
+        select *
         from t_user where flag != 3 and phone = #{phone}
     </select>
 
 
 
     <select id="queryByOpenid" resultType="UserInfo">
-        select
-        id as id,
-        registIp as registIp,
-        registAreaCode as registAreaCode,
-        phone as phone,
-        nickName as nickName,
-        avatar as avatar,
-        birthday as birthday,
-        sex as sex,
-        emergencyContact as emergencyContact,
-        emergencyContactNumber as emergencyContactNumber,
-        isAuth as isAuth,
-        name as name,
-        idCard as idCard,
-        idCardFront as idCardFront,
-        idCardReverse as idCardReverse,
-        consumption as consumption,
-        balance as balance,
-        integral as integral,
-        passWord as passWord,
-        openId as openId,
-        appletsOpenId as appletsOpenId,
-        unionid as unionid,
-        state as state,
-        flag as flag,
-        insertTime as insertTime,
-        insertUser as insertUser,
-        updateTime as updateTime,
-        updateUser as updateUser
+        select *
         from t_user where flag != 3
         <if test="null != openid">
             and openId = #{openid}
@@ -110,35 +55,7 @@
 
 
     <select id="queryByOpenid2" resultType="UserInfo">
-        select
-        id as id,
-        registIp as registIp,
-        registAreaCode as registAreaCode,
-        phone as phone,
-        nickName as nickName,
-        avatar as avatar,
-        birthday as birthday,
-        sex as sex,
-        emergencyContact as emergencyContact,
-        emergencyContactNumber as emergencyContactNumber,
-        isAuth as isAuth,
-        name as name,
-        idCard as idCard,
-        idCardFront as idCardFront,
-        idCardReverse as idCardReverse,
-        consumption as consumption,
-        balance as balance,
-        integral as integral,
-        passWord as passWord,
-        openId as openId,
-        appletsOpenId as appletsOpenId,
-        unionid as unionid,
-        state as state,
-        flag as flag,
-        insertTime as insertTime,
-        insertUser as insertUser,
-        updateTime as updateTime,
-        updateUser as updateUser
+        select *
         from t_user where flag != 3
         <if test="null != openid">
             and appletsOpenId = #{openid}
@@ -156,7 +73,7 @@
         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,
+        CONCAT(a.firstName, ' ', a.lastName) as name,
         a.integral as integral,
         a.emergencyContact as emergencyContact,
         a.emergencyContactNumber as emergencyContactNumber,
@@ -180,7 +97,7 @@
         select
         id as id,
         userId as userId,
-        name as name,
+        CONCAT(firstName, ' ', lastName) as name,
         idcode as idcode,
         img1 as img1,
         img2 as img2,
@@ -192,9 +109,9 @@
             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
+                DATE_FORMAT(insertTime,'%Y-%m-%d %H:%i') as insertTime
             from t_user
                 where uid=#{uid}
                 and uType=#{uType}

--
Gitblit v1.7.1