用户收获地址

sd-business/src/main/java/com/sd/business/service/area/impl/AreaUserServiceImpl.java

@@ -42,7 +42,7 @@ public class AreaUserServiceImpl extends ServiceImpl<AreaUserMapper, AreaUser> i
                 .selectAll(AreaUser.class)
                 .from(AreaUser.class)
                 .orderByDesc(AreaUser::getId)
-                .page(dto.getPage());
+                .page(dto);
 
         List<AreaUserVo> records = page.getRecords();
         if (records.isEmpty()) {

sd-business/src/main/java/com/sd/business/service/artwork/impl/ArtworkLibraryServiceImpl.java

@@ -37,7 +37,7 @@ public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper,
                 .from(ArtworkLibrary.class)
                 .like(ArtworkLibrary::getArtworkName, dto.getArtworkName())
                 .orderByDesc(ArtworkLibrary::getId)
-                .page(dto.getPage());
+                .page(dto);
 
         return page;
     }

sd-business/src/main/java/com/sd/business/service/bom/impl/BomServiceImpl.java

@@ -79,7 +79,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
                 .eq(Bom::getReverseGrain, dto.getReverseGrain())
                 .in(Bom::getBomClassifyId, dto.getBomClassifyIdList())
                 .orderByDesc(Bom::getId)
-                .page(dto.getPage());
+                .page(dto);
 
         List<BomVo> records = page.getRecords();
         if (records.isEmpty()) {

sd-business/src/main/java/com/sd/business/service/bom/impl/BomSpecServiceImpl.java

@@ -31,7 +31,7 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
                 .selectAll(BomSpec.class)
                 .from(BomSpec.class)
                 .orderByDesc(BomSpec::getId)
-                .page(dto.getPage());
+                .page(dto);
 
         return page;
     }

sd-business/src/main/java/com/sd/business/service/sku/impl/SkuUserServiceImpl.java

@@ -43,7 +43,7 @@ public class SkuUserServiceImpl extends ServiceImpl<SkuUserMapper, SkuUser> impl
                 .like(SkuUser::getCode, dto.getCode())
                 .like(SkuUser::getName, dto.getName())
                 .orderByDesc(SkuUser::getId)
-                .page(dto.getPage());
+                .page(dto);
 
         return page;
     }

sd-framework/src/main/java/com/sd/framework/util/sql/Where.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 
 import java.util.Collection;
 import java.util.List;
@@ -556,6 +557,10 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         return result;
     }
 
+    public Page<T> page(BaseSelectDto dto) {
+        return page(dto.getPage());
+    }
+
     public T one() {
         Map<String, Object> one = Sql.mapper.one(sql.getSql(), this);
         return BeanUtil.copyProperties(one, sql.resultCls);