角色列表查询

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/pojo/OrgBO.java

@@ -6,7 +6,6 @@
 package org.eco.vip.auth.domain.org.pojo;
 
 
-import com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -29,7 +28,6 @@ public class OrgBO extends BaseBO {
     /**
      * 组织id
      */
-    @Id
     private String orgId;
     /**
      * 父组织ID

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/pojo/OrgVO.java

@@ -5,7 +5,6 @@
 package org.eco.vip.auth.domain.org.pojo;
 
 
-import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.RelationOneToOne;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -27,7 +26,6 @@ public class OrgVO extends BaseEntity {
     /**
      * 部门ID
      */
-    @Id
     private String orgId;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/position/pojo/PositionVO.java

@@ -6,7 +6,6 @@
 package org.eco.vip.auth.domain.position.pojo;
 
 
-import com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,7 +26,6 @@ public class PositionVO extends BaseBO {
     /**
      * 唯一标识
      */
-    @Id
     private String positionId;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/user/pojo/UserVO.java

@@ -7,7 +7,6 @@ package org.eco.vip.auth.domain.user.pojo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,7 +28,6 @@ public class UserVO extends BaseEntity {
     /**
      * 用户ID
      */
-    @Id
     private String userId;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/role/RoleService.java

@@ -6,6 +6,7 @@
 package org.eco.vip.auth.service.role;
 
 
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryMethods;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
@@ -18,6 +19,7 @@ import org.eco.vip.auth.domain.role.pojo.RoleVO;
 import org.eco.vip.auth.mapper.RoleMapper;
 import org.eco.vip.auth.mapper.RoleMenuMapper;
 import org.eco.vip.auth.mapper.RolePermMapper;
+import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
 import org.eco.vip.orm.utils.MapstructUtils;
@@ -48,9 +50,23 @@ public class RoleService extends BaseService<RoleMapper, Role> implements IRoleS
     @Resource
     private RoleMenuMapper roleMenuMapper;
 
+    @Resource
+    private RoleMapper roleMapper;
+
+    private QueryWrapper buildQueryWrapper(RoleBO roleBO) {
+        return super.buildBaseQueryWrapper()
+                .and(ROLE.ORG_ID.eq(roleBO.getOrgId()))
+                .and(ROLE.CODE.eq(roleBO.getCode()))
+                .and(ROLE.CATEGORY.eq(roleBO.getCategory()))
+                .and(ROLE.NAME.eq(roleBO.getName()))
+                .and(ROLE.STATUS.eq(roleBO.getStatus()));
+    }
+
     @Override
     public PageResult<RoleVO> selectPage(RoleBO roleBO) {
-        return null;
+        QueryWrapper queryWrapper = buildQueryWrapper(roleBO);
+        Page<RoleVO> page = roleMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, RoleVO.class);
+        return PageResult.build(page);
     }
 
     @Override

eco-start/src/main/resources/db/mysql/V1_0_0_1__sys-init-ddl.sql

@@ -202,6 +202,7 @@ CREATE TABLE `system_role_perm_t`
     PRIMARY KEY (`role_id`, `perm_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色权限关系' ROW_FORMAT = DYNAMIC;
 
+
 -- ----------------------------
 -- Table structure for system_role_t
 -- ----------------------------
@@ -226,6 +227,13 @@ CREATE TABLE `system_role_t`
     PRIMARY KEY (`role_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_role_t
+-- ----------------------------
+INSERT INTO `system_role_t`
+VALUES ('1', NULL, '超级管理员', 'superAdminRole', 'GLOBAL', 0, '1', '1', 0, '0', '1', '2025-07-14 15:50:52', '1',
+        '2025-07-14 15:50:52', NULL);
+
 -- ----------------------------
 -- Table structure for system_user_role_t
 -- ----------------------------