diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt b/src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt index acf2ed8..3b3f382 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt +++ b/src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt @@ -15,7 +15,7 @@ import top.fatweb.api.entity.permission.Group interface GroupMapper : BaseMapper { fun selectPage(page: IPage, searchName: String?, searchRegex: Boolean): IPage - fun getWithRoleByList(groupIds: List): List? + fun selectListWithRoleByIds(groupIds: List): List? - fun selectOne(id: Long): Group? + fun selectOneById(id: Long): Group? } 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 a46d1da..637174b 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 interface RoleMapper : BaseMapper { fun selectPage(page: IPage, searchName: String?, searchRegex: Boolean): IPage - fun getWithPowerByList(roleIds: List): List? + fun selectListWithPowerByIds(roleIds: List): List? - fun selectOne(id: Long): Role? + fun selectOneById(id: Long): Role? } diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt index a486c1b..9f045bc 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt @@ -36,14 +36,14 @@ class GroupServiceImpl( baseMapper.selectPage(groupIdsPage, groupGetParam?.searchName, groupGetParam?.searchRegex ?: false) val groupPage = Page(groupIdsPage.current, groupIdsIPage.size, groupIdsIPage.total) if (groupIdsIPage.total > 0) { - groupPage.setRecords(baseMapper.getWithRoleByList(groupIdsIPage.records)) + groupPage.setRecords(baseMapper.selectListWithRoleByIds(groupIdsIPage.records)) } return GroupConverter.groupPageToGroupWithRolePageVo(groupPage) } override fun getOne(id: Long): GroupWithRoleVo? { - return baseMapper.selectOne(id)?.let { GroupConverter.groupToGroupWithRoleVo(it) } ?: let { null } + return baseMapper.selectOneById(id)?.let { GroupConverter.groupToGroupWithRoleVo(it) } ?: let { null } } override fun listAll(): 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 1bcf5ce..4df42ac 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 @@ -41,7 +41,7 @@ class RoleServiceImpl( val rolePage = Page(roleIdsPage.current, roleIdsIPage.size, roleIdsIPage.total) if (roleIdsIPage.total > 0) { - rolePage.setRecords(baseMapper.getWithPowerByList(roleIdsIPage.records)) + rolePage.setRecords(baseMapper.selectListWithPowerByIds(roleIdsIPage.records)) } @@ -49,7 +49,7 @@ class RoleServiceImpl( } override fun getOne(id: Long): RoleWithPowerVo? { - return baseMapper.selectOne(id)?.let { RoleConverter.roleToRoleWithPowerVo(it) } ?: let { null } + return baseMapper.selectOneById(id)?.let { RoleConverter.roleToRoleWithPowerVo(it) } ?: let { null } } override fun listAll(): List { diff --git a/src/main/resources/mapper/permission/GroupMapper.xml b/src/main/resources/mapper/permission/GroupMapper.xml index 84d4cb4..e32fae4 100644 --- a/src/main/resources/mapper/permission/GroupMapper.xml +++ b/src/main/resources/mapper/permission/GroupMapper.xml @@ -19,7 +19,7 @@ - select t_group.id as group_id, t_group.name as group_name, t_group.enable as group_enable, @@ -45,7 +45,7 @@ - select t_group.id as group_id, t_group.name as group_name, t_group.enable as group_enable, diff --git a/src/main/resources/mapper/permission/RoleMapper.xml b/src/main/resources/mapper/permission/RoleMapper.xml index 4df4773..6b1829e 100644 --- a/src/main/resources/mapper/permission/RoleMapper.xml +++ b/src/main/resources/mapper/permission/RoleMapper.xml @@ -19,7 +19,7 @@ - select distinct t_role.id as role_id, t_role.name as role_name, t_role.enable as role_enable, @@ -57,7 +57,7 @@ - select distinct t_role.id as role_id, t_role.name as role_name, t_role.enable as role_enable,