From bbd57e354a2898e7e29a4d8a08bd1af95e8c456c Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Fri, 10 May 2019 14:54:48 +0800 Subject: [PATCH] delete tenant user display --- .../java/cn/escheduler/dao/mapper/UserMapperProvider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java index 9293d2439..2fe0af9f2 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java @@ -204,13 +204,17 @@ public class UserMapperProvider { return new SQL() { { SELECT("u.*,t.tenant_name as tenantName,q.queue_name as queueName"); - FROM(TABLE_NAME +" u,t_escheduler_tenant t,t_escheduler_queue q"); - WHERE("u.user_type = 1 AND u.tenant_id = t.id and t.queue_id = q.id"); + FROM(TABLE_NAME + " u "); + LEFT_OUTER_JOIN("t_escheduler_tenant t on u.tenant_id = t.id"); + LEFT_OUTER_JOIN("t_escheduler_queue q on t.queue_id = q.id"); + WHERE("u.user_type = 1"); Object searchVal = parameter.get("searchVal"); if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){ WHERE( " u.user_name like concat('%', #{searchVal}, '%') "); } ORDER_BY(" u.update_time desc limit #{offset},#{pageSize} "); + + } }.toString(); -- GitLab