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 920e03b..81c40af 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
@@ -38,7 +38,9 @@ class RoleServiceImpl(
             baseMapper.selectPage(roleIdsPage, roleGetParam?.searchName, roleGetParam?.searchRegex ?: false)
 
         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)
diff --git a/src/main/resources/mapper/permission/RoleMapper.xml b/src/main/resources/mapper/permission/RoleMapper.xml
index e3b918a..02cf5f4 100644
--- a/src/main/resources/mapper/permission/RoleMapper.xml
+++ b/src/main/resources/mapper/permission/RoleMapper.xml
@@ -6,14 +6,16 @@
         from t_role
         <where>
             deleted = 0
-            <choose>
-                <when test="searchRegex == true">
-                    and t_role.name regexp #{searchName}
-                </when>
-                <otherwise>
-                    and t_role.name like concat('%' ,#{searchName}, '%')
-                </otherwise>
-            </choose>
+            <if test="searchName != null">
+                <choose>
+                    <when test="searchRegex == true">
+                        and t_role.name regexp #{searchName}
+                    </when>
+                    <otherwise>
+                        and t_role.name like concat('%' ,#{searchName}, '%')
+                    </otherwise>
+                </choose>
+            </if>
         </where>
     </select>