测试分页，排序

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/controller/dept/DeptController.java

@@ -8,13 +8,19 @@ package org.eco.vip.auth.controller.dept;
 
 import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.dept.Dept;
+import org.eco.vip.auth.domain.dept.vo.DeptVO;
 import org.eco.vip.auth.service.dept.IDeptService;
+import org.eco.vip.orm.pojo.CommonResult;
+import org.eco.vip.orm.pojo.PageResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.eco.vip.orm.pojo.CommonResult.success;
+
 /**
  * @author GaoKunW
+ *
  * @description DeptController
  * @date 2025/3/10 20:59
  */
@@ -26,6 +32,12 @@ public class DeptController {
 
     @GetMapping("/get")
     public Dept getDept() {
-        return deptService.getById(2L);
+        return deptService.getById("2");
     }
+
+    @GetMapping("/page")
+    public CommonResult<PageResult<DeptVO>> page() {
+        return success(deptService.selectPage());
+    }
+
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/controller/user/UserController.java

@@ -8,11 +8,16 @@ package org.eco.vip.auth.controller.user;
 
 import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.auth.domain.user.vo.UserVO;
 import org.eco.vip.auth.service.user.IUserService;
+import org.eco.vip.orm.pojo.CommonResult;
+import org.eco.vip.orm.pojo.PageResult;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+import static org.eco.vip.orm.pojo.CommonResult.success;
+
 /**
  * @description UserController
  *
@@ -31,6 +36,11 @@ public class UserController {
         return userService.getUsers();
     }
 
+    @GetMapping("/page")
+    public CommonResult<PageResult<UserVO>> page() {
+        return success(userService.selectPage());
+    }
+
     @PostMapping
     public Boolean add(@RequestBody User user) {
         return userService.insertUser(user);

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/dept/Dept.java

@@ -6,8 +6,6 @@
 package org.eco.vip.auth.domain.dept;
 
 
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
@@ -32,7 +30,7 @@ public class Dept extends BaseEntity {
      * 部门ID
      */
     @Id
-    private String id;
+    private String deptId;
 
     /**
      * 父部门ID
@@ -42,7 +40,7 @@ public class Dept extends BaseEntity {
     /**
      * 祖级列表
      */
-    private String ancestors;
+//    private String ancestors;
 
     /**
      * 部门名称
@@ -57,13 +55,13 @@ public class Dept extends BaseEntity {
     /**
      * 负责人
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
-    private Long leaderId;
+//    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
+//    private Long leaderId;
 
     /**
      * 负责人
      */
-    private String leader;
+//    private String leader;
 
     /**
      * 联系电话

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/dept/vo/DeptVO.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ */
+
+package org.eco.vip.auth.domain.dept.vo;
+
+
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.mybatisflex.annotation.Id;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.vip.auth.domain.dept.Dept;
+import org.eco.vip.orm.domain.BaseEntity;
+
+/**
+ * @description DeptVO
+ *
+ * @author GaoKunW
+ * @date 2025/7/1 23:22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Dept.class, reverseConvertGenerate = false)
+public class DeptVO extends BaseEntity {
+    /**
+     * 部门ID
+     */
+    @Id
+    private String deptId;
+
+    /**
+     * 父部门ID
+     */
+    private String parentId;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
+    private Long leaderId;
+
+    /**
+     * 负责人
+     */
+    private String leader;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+}

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

@@ -31,7 +31,7 @@ public class User extends BaseEntity {
      * 用户ID
      */
     @Id
-    private String id;
+    private String userId;
 
     /**
      * 部门ID

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

@@ -5,17 +5,88 @@
 
 package org.eco.vip.auth.domain.user.vo;
 
+import com.mybatisflex.annotation.Id;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.vip.auth.domain.user.User;
 import org.eco.vip.orm.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * @description UserVO
  *
  * @author GaoKunW
  * @date 2025/7/1 18:10
  */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = User.class, reverseConvertGenerate = false)
 public class UserVO extends BaseEntity {
     /**
-     * 用户编号
+     * 用户ID
      */
+    @Id
     private String userId;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 用户账号
+     */
+    private String account;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户登录设备类型（sys_user系统用户、app_user App用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 用户性别
+     */
+    private String gender;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/dept/DeptService.java

@@ -6,9 +6,14 @@
 package org.eco.vip.auth.service.dept;
 
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
 import org.eco.vip.auth.domain.dept.Dept;
+import org.eco.vip.auth.domain.dept.vo.DeptVO;
 import org.eco.vip.auth.mapper.DeptMapper;
+import org.eco.vip.orm.domain.PageQuery;
+import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.orm.service.BaseService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,5 +23,16 @@ import org.springframework.stereotype.Service;
  * @date 2025/3/10 21:01
  */
 @Service
-public class DeptService extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
+public class DeptService extends BaseService<DeptMapper, Dept> implements IDeptService {
+    private QueryWrapper buildQueryWrapper() {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        return queryWrapper;
+    }
+
+    @Override
+    public PageResult<DeptVO> selectPage() {
+        QueryWrapper queryWrapper = buildQueryWrapper();
+        Page<DeptVO> page = this.pageAs(PageQuery.build(), queryWrapper, DeptVO.class);
+        return PageResult.build(page);
+    }
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/dept/IDeptService.java

@@ -8,6 +8,8 @@ package org.eco.vip.auth.service.dept;
 
 import com.mybatisflex.core.service.IService;
 import org.eco.vip.auth.domain.dept.Dept;
+import org.eco.vip.auth.domain.dept.vo.DeptVO;
+import org.eco.vip.orm.pojo.PageResult;
 
 /**
  * @author GaoKunW
@@ -15,4 +17,5 @@ import org.eco.vip.auth.domain.dept.Dept;
  * @date 2025/3/10 20:59
  */
 public interface IDeptService extends IService<Dept> {
+    PageResult<DeptVO> selectPage();
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/IUserService.java

@@ -9,6 +9,7 @@ package org.eco.vip.auth.service.user;
 import com.mybatisflex.core.service.IService;
 import org.eco.vip.auth.domain.user.User;
 import org.eco.vip.auth.domain.user.vo.UserVO;
+import org.eco.vip.orm.pojo.PageResult;
 
 import java.util.List;
 
@@ -19,6 +20,8 @@ import java.util.List;
  * @date 2025/3/9 23:20
  */
 public interface IUserService extends IService<User> {
+    PageResult<UserVO> selectPage();
+
     List<User> getUsers();
 
     boolean insertUser(User user);

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/UserService.java

@@ -6,11 +6,15 @@
 package org.eco.vip.auth.service.user;
 
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.user.User;
 import org.eco.vip.auth.domain.user.vo.UserVO;
 import org.eco.vip.auth.mapper.UserMapper;
+import org.eco.vip.orm.domain.PageQuery;
+import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.orm.service.BaseService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,12 +26,21 @@ import java.util.List;
  * @date 2025/3/9 23:20
  */
 @Service
-public class UserService extends ServiceImpl<UserMapper, User> implements IUserService {
+public class UserService extends BaseService<UserMapper, User> implements IUserService {
     @Resource
     private UserMapper userMapper;
 
+    private QueryWrapper buildQueryWrapper() {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        return queryWrapper;
+    }
 
-
+    @Override
+    public PageResult<UserVO> selectPage() {
+        QueryWrapper queryWrapper = buildQueryWrapper();
+        Page<UserVO> page = this.pageAs(PageQuery.build(), queryWrapper, UserVO.class);
+        return PageResult.build(page);
+    }
 
     @Override
     public List<User> getUsers() {