FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Complete core functions #9

Merged
FatttSnake merged 171 commits from FatttSnake into dev 2024-02-23 11:56:35 +08:00
Conversation 0 Commits 171 Files Changed 381 +13 -9
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c0c033ad77 - Show all commits

4
src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt
View File

@@ -38,7 +38,9 @@ class RoleServiceImpl(
baseMapper.selectPage(roleIdsPage, roleGetParam?.searchName, roleGetParam?.searchRegex ?: false) baseMapper.selectPage(roleIdsPage, roleGetParam?.searchName, roleGetParam?.searchRegex ?: false)
val rolePage = Page<Role>(roleIdsPage.current, roleIdsIPage.size, roleIdsIPage.total) val rolePage = Page<Role>(roleIdsPage.current, roleIdsIPage.size, roleIdsIPage.total)
rolePage.setRecords(baseMapper.getWithPowerByList(roleIdsIPage.records)) if (roleIdsIPage.total > 0) {
rolePage.setRecords(baseMapper.getWithPowerByList(roleIdsIPage.records))
}
return RoleConverter.rolePageToRoleWithPowerPageVo(rolePage) return RoleConverter.rolePageToRoleWithPowerPageVo(rolePage)

18
src/main/resources/mapper/permission/RoleMapper.xml
View File

@@ -6,14 +6,16 @@
from t_role from t_role
<where> <where>
deleted = 0 deleted = 0
<choose> <if test="searchName != null">
<when test="searchRegex == true"> <choose>
and t_role.name regexp #{searchName} <when test="searchRegex == true">
</when> and t_role.name regexp #{searchName}
<otherwise> </when>
and t_role.name like concat('%' ,#{searchName}, '%') <otherwise>
</otherwise> and t_role.name like concat('%' ,#{searchName}, '%')
</choose> </otherwise>
</choose>
</if>
</where> </where>
</select> </select>