From 7607bab6e868a51609164ce111c9d5e1046cd11f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Sep 2021 14:44:00 +0800
Subject: [PATCH] 走航车实时websocket，小时表分表
---
screen-api/src/main/resources/mapper/UserMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index bf95aac..fa2b662 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -25,27 +25,28 @@
<result column="id" property="id" jdbcType="INTEGER"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="location_level_code" property="locationLevelCode"/>
- <result column="org_expire_ime" property="expireTime"/>
+ <result column="org_expire_time" property="expireTime"/>
</association>
<!--���������-->
- <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
+ <association property="group" javaType="com.moral.api.entity.Group">
<id column="group_id" property="id" jdbcType="INTEGER"/>
<result column="group_name" property="groupName" jdbcType="VARCHAR"/>
- </collection>
+ </association>
</resultMap>
<!--������������������������������������������-->
<select id="selectUserInfo" resultMap="userInfoMap">
SELECT u.id, u.account, u.password, u.user_name, u.email, u.mobile, u.wechat ,u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
- o.name, o.location_level_code, o.expire_time org_expire_ime,
+ o.name, o.location_level_code, o.expire_time org_expire_time,
a.id group_id , a.group_name
FROM `user` u
LEFT JOIN
(SELECT ug.user_id,g.id,g.group_name FROM `user_group` ug ,`group` g WHERE ug.group_id=g.id AND g.is_delete = 0
- AND ug.is_delete = 0) a
+ AND ug.is_delete = '0') a
ON a.user_id=u.id
LEFT JOIN `organization` o ON o.id=u.organization_id
WHERE u.account = #{account}
+ AND u.is_delete = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0