From 722db9e28a0c8e33d79621c66c0ecf1d60fcf0f6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 09:55:11 +0800
Subject: [PATCH] 7.17
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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..8353e70 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"/>
@@ -50,7 +51,7 @@
emergencyContact as emergencyContact,
emergencyContactNumber as emergencyContactNumber,
isAuth as isAuth,
- name as name,
+ CONCAT(firstName, ' ', lastName) as name,
idCard as idCard,
idCardFront as idCardFront,
idCardReverse as idCardReverse,
@@ -85,7 +86,7 @@
emergencyContact as emergencyContact,
emergencyContactNumber as emergencyContactNumber,
isAuth as isAuth,
- name as name,
+ CONCAT(firstName, ' ', lastName) as name,
idCard as idCard,
idCardFront as idCardFront,
idCardReverse as idCardReverse,
@@ -122,7 +123,7 @@
emergencyContact as emergencyContact,
emergencyContactNumber as emergencyContactNumber,
isAuth as isAuth,
- name as name,
+ CONCAT(firstName, ' ', lastName) as name,
idCard as idCard,
idCardFront as idCardFront,
idCardReverse as idCardReverse,
@@ -156,7 +157,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 +181,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 +193,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