diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt b/src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt index b75bd5f..d4af4bf 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt +++ b/src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt @@ -15,7 +15,7 @@ import top.fatweb.api.entity.permission.Role */ @Mapper interface RoleMapper : BaseMapper { - fun selectPage(page: IPage): IPage + fun selectPage(page: IPage, searchName: String?, searchRegex: Boolean): IPage fun getWithPowerByList(roleIds: List): List? diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt index b5b9a82..920e03b 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt @@ -34,7 +34,8 @@ class RoleServiceImpl( PageUtil.setPageSort(roleGetParam, roleIdsPage) - val roleIdsIPage = baseMapper.selectPage(roleIdsPage) + val roleIdsIPage = + baseMapper.selectPage(roleIdsPage, roleGetParam?.searchName, roleGetParam?.searchRegex ?: false) val rolePage = Page(roleIdsPage.current, roleIdsIPage.size, roleIdsIPage.total) rolePage.setRecords(baseMapper.getWithPowerByList(roleIdsIPage.records)) diff --git a/src/main/resources/mapper/permission/RoleMapper.xml b/src/main/resources/mapper/permission/RoleMapper.xml index 4289e01..e3b918a 100644 --- a/src/main/resources/mapper/permission/RoleMapper.xml +++ b/src/main/resources/mapper/permission/RoleMapper.xml @@ -4,7 +4,17 @@