Browse Source

Merge pull request #274 from qiaozhanwei/branch-1.0.2

delete tenant user display
pull/2/head
乔占卫 5 years ago committed by GitHub
parent
commit
2347773aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java

8
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();

Loading…
Cancel
Save