From b085a13260ad46142af47cd58ac641c69a354cb1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 10:05:02 +0800
Subject: [PATCH] 包含最大值，最小值，平均值的小时表创建任务
---
screen-api/src/main/resources/mapper/UserMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index 0dc1aca..fa2b662 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -28,10 +28,10 @@
<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>
<!--������������������������������������������-->
@@ -42,10 +42,11 @@
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