From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期二, 02 一月 2024 14:26:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java index d40f9dd..5fce70f 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java @@ -269,4 +269,28 @@ public List<FinSysTenantUser> getByOrgId(Long orgId) { return this.select(SQL_GET_USER, new Object[] {orgId}, new FinSysTenantUser()); } + + @Override + public GenericPager<S_role> queryPageRoleList(Long orgId, Integer status, String roleName, Integer dataScope, + Integer pageNum, Integer pageSize) { + Map<String, Object> parameters = new HashMap(); + StringBuilder sql = new StringBuilder("select * from s_role where org_id=:orgId"); + parameters.put("orgId", orgId); + if (status >= 0) { + sql.append(" and status=:status"); + parameters.put("status", status); + } + + if (dataScope != null) { + sql.append(" and data_scope >=:dataScope"); + parameters.put("dataScope", dataScope); + } + + if (com.walker.infrastructure.utils.StringUtils.isNotEmpty(roleName)) { + sql.append(" and role_name like :roleName"); + parameters.put("roleName", "%" + roleName + "%"); + } + + return this.selectSplit(sql.toString(), parameters, pageNum, pageSize, new S_role()); + } } -- Gitblit v1.9.1