修改接口

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -35,6 +35,13 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
     @ResultMap(value = "SelectAllAndUserNum")
     List<SysRole> queryRoles(@Param("corpId") String corpId);
 
+    @Select("<script>select * from tm_admin_role  " +
+            "  where r_status = 1   " +
+            "  and corp_id = #{corpId} " +
+            "  order by r_type desc , r_createdate asc</script>")
+    @ResultMap(value = "SelectAllAndUserNum")
+    List<SysRole> queryAllRoles(@Param("corpId") String corpId);
+
     //获得此角色的用户数
     int countUserNum(String roleId);
 

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -106,11 +106,7 @@ public class SysRoleServiceImpl implements SysRoleService {
 
     @Override
     public List<SysRole> queryRolesAll(String corpId) {
-//        SysRole sysRole = new SysRole();
-//        BeanUtils.copyProperties(findRolePaginDTO,sysRole);
-//        sysRole.setNotDeleted();
-//        sysRole.setStart();
-        return sysRoleRepository.queryRoles(corpId);
+        return sysRoleRepository.queryAllRoles(corpId);
     }
 
     @Override