diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/node/req/ListNodeReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/node/req/ListNodeReq.java
index 622cb1f..64c3469 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/node/req/ListNodeReq.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/node/req/ListNodeReq.java
@@ -1,18 +1,17 @@
 package cn.axzo.orgmanax.api.node.req;
 
-import cn.axzo.foundation.page.IPageReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import cn.axzo.foundation.page.PageReqV2;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 import java.util.Set;
 
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@Builder
-public class ListNodeReq implements IPageReq {
+@SuperBuilder
+public class ListNodeReq extends PageReqV2 {
     /**
      * 页数
      */
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/req/ListNodeUserReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/req/ListNodeUserReq.java
index 52d55bd..6578985 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/req/ListNodeUserReq.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/req/ListNodeUserReq.java
@@ -2,20 +2,19 @@ package cn.axzo.orgmanax.api.nodeuser.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
-import cn.axzo.foundation.page.IPageReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import cn.axzo.foundation.page.PageReqV2;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 import java.util.Set;
 
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@Builder
-public class ListNodeUserReq implements IPageReq {
+@SuperBuilder
+public class ListNodeUserReq extends PageReqV2 {
 
     @CriteriaField
     private Long id;
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/ListOrgJobReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/ListOrgJobReq.java
index aac94c0..a7bf9dc 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/ListOrgJobReq.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/ListOrgJobReq.java
@@ -1,17 +1,15 @@
 package cn.axzo.orgmanax.api.orgjob.req;
 
-import cn.axzo.foundation.page.IPageReq;
-import com.alibaba.fastjson.JSONObject;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import cn.axzo.foundation.page.PageReqV2;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@Builder
-public class ListOrgJobReq implements IPageReq {
+@SuperBuilder
+public class ListOrgJobReq extends PageReqV2 {
 
     /**
      * 名称
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java
index 42d4d19..22b02aa 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/req/PageOrgJobReq.java
@@ -2,21 +2,20 @@ package cn.axzo.orgmanax.api.orgjob.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
-import cn.axzo.foundation.page.IPageReq;
+import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.orgmanax.api.orgjob.enums.OrgJobGroupFlagEnum;
-import java.util.List;
-import java.util.Set;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+import java.util.List;
+import java.util.Set;
+
+@EqualsAndHashCode(callSuper = true)
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-public class PageOrgJobReq implements IPageReq {
+public class PageOrgJobReq extends PageReqV2 {
     /**
      * 岗位ids
      */
diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/req/ListOrgUserReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/req/ListOrgUserReq.java
index 5565bf9..9c66233 100644
--- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/req/ListOrgUserReq.java
+++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/req/ListOrgUserReq.java
@@ -2,21 +2,19 @@ package cn.axzo.orgmanax.api.orguser.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
-import cn.axzo.foundation.page.IPageReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import cn.axzo.foundation.page.PageReqV2;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 import java.util.Set;
 
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @SuperBuilder
-public class ListOrgUserReq implements IPageReq {
+public class ListOrgUserReq extends PageReqV2 {
     @CriteriaField
     private Long id;
     @CriteriaField(field = "id", operator = Operator.IN)
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java
index 4069307..e9eb82e 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java
@@ -1,12 +1,12 @@
 package cn.axzo.orgmanax.infra.dao.orgjob.repository;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
-import cn.axzo.foundation.dao.support.wrapper.Operator;
-import cn.axzo.foundation.page.IPageReq;
+import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -15,11 +15,12 @@ public interface OrgJobQueryRepository {
     PageResp<OrgJob> page(ListReq req);
 
 
+    @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
     @AllArgsConstructor
     @Data
     @SuperBuilder
-    class ListReq implements IPageReq {
+    class ListReq extends PageReqV2 {
 
         @CriteriaField
         private String name;
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitContactQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitContactQueryRepository.java
index 191553a..12c1b7f 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitContactQueryRepository.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitContactQueryRepository.java
@@ -3,6 +3,7 @@ package cn.axzo.orgmanax.infra.dao.unit.repository;
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
 import cn.axzo.foundation.page.IPageReq;
+import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalContact;
 import cn.hutool.core.bean.BeanUtil;
@@ -26,11 +27,12 @@ public interface UnitContactQueryRepository {
         return page(pageReq).getData();
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
     @AllArgsConstructor
     @Data
     @SuperBuilder
-    class ListReq implements IPageReq {
+    class ListReq extends PageReqV2 {
         @CriteriaField
         private Long id;
         @CriteriaField(field = "id", operator = Operator.IN)
diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
index 02e486d..92188fd 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java
@@ -1,15 +1,12 @@
 package cn.axzo.orgmanax.infra.dao.unit.repository;
 
-import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
 import cn.axzo.foundation.page.IPageReq;
+import cn.axzo.foundation.page.PageReqV2;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.base.Preconditions;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -74,11 +71,12 @@ public interface UnitQueryRepository {
         }
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
     @AllArgsConstructor
     @Data
     @SuperBuilder
-    class ListReq implements IPageReq{
+    class ListReq extends PageReqV2 {
         @CriteriaField
         private Long id;
         @CriteriaField(field = "id", operator = Operator.IN)