service 层代码优化 （分页统一封装优化）

src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java

@@ -41,11 +41,8 @@ public class AuthAdminServiceImpl implements AuthAdminService {
         if (filterAuthUserRequest == null) {
             return Collections.emptyList();
         }
-        if (filterAuthUserRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterAuthUserRequest.getPage() - 1) * filterAuthUserRequest.getLimit();
+        filterAuthUserRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterAuthUserRequest.getLimit());
-        }
-
         return authAdminDao.listAdminPage(filterAuthUserRequest);
     }
 
@@ -153,10 +150,8 @@ public class AuthAdminServiceImpl implements AuthAdminService {
         if (filterNoSelectUserRequest == null) {
             return Collections.emptyList();
         }
-        if (filterNoSelectUserRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit();
+        filterNoSelectUserRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit());
-        }
         return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(), filterNoSelectUserRequest.getDeptId());
     }
 

src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java

@@ -28,10 +28,8 @@ public class AuthCheckServiceImpl implements AuthCheckService {
         if (filterAuthCheckRequest == null) {
             return Collections.emptyList();
         }
-        if (filterAuthCheckRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterAuthCheckRequest.getPage() - 1) * filterAuthCheckRequest.getLimit();
+        filterAuthCheckRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterAuthCheckRequest.getLimit());
-        }
         return authCheckDao.filterDevices(filterAuthCheckRequest);
     }
 

src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java

@@ -28,11 +28,8 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
         if (customerInfoFilterRequest == null) {
             return Collections.emptyList();
         }
-
+        // 分页处理
-        if (customerInfoFilterRequest.getPage() != null) {
+        customerInfoFilterRequest.pageDispose();
-            int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit();
-            PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit());
-        }
         return customerInfoDao.filterCustomerInfo(customerInfoFilterRequest);
     }
 
@@ -41,8 +38,8 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
         if (customerInfoFilterRequest == null) {
             return Collections.emptyList();
         }
-        int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit();
+        // 分页处理
-        PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit());
+        customerInfoFilterRequest.pageDispose();
         List<CustomerDetailEntity> customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest);
         return customerDetailEntities;
     }

src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java

@@ -47,10 +47,8 @@ public class DeptServiceImpl implements DeptService {
         if (filterInvWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
+        filterInvWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
-        }
         List<DeptEntity> data = deptDao.filterInvWarehouse(filterInvWarehouseRequest);
         return data;
     }
@@ -60,10 +58,8 @@ public class DeptServiceImpl implements DeptService {
         if (filterInvWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
+        filterInvWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
-        }
         List<DeptEntity> data = deptDao.filterAllByUser(filterInvWarehouseRequest);
         return data;
     }
@@ -73,10 +69,8 @@ public class DeptServiceImpl implements DeptService {
         if (filterInvWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
+        filterInvWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
-        }
         List<DeptEntity> data = deptDao.filterGroupInvWarehouse(filterInvWarehouseRequest);
         return data;
     }

src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java

@@ -27,10 +27,8 @@ public class DeptUserServiceImpl implements DeptUserService {
 
     @Override
     public List<DeptUserEntity> selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) {
-        if (filterDeptUserReqeust.getPage() != null) {
+        // 分页处理
-            int offset = (filterDeptUserReqeust.getPage() - 1) * filterDeptUserReqeust.getLimit();
+        filterDeptUserReqeust.pageDispose();
-            PageHelper.offsetPage(offset, filterDeptUserReqeust.getLimit());
-        }
         return deptUserDao.selectDeptUser(filterDeptUserReqeust);
     }
 
@@ -50,10 +48,8 @@ public class DeptUserServiceImpl implements DeptUserService {
 
     @Override
     public List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) {
-        if (filterDeptUserReqeust.getPage() != null) {
+        // 分页处理
-            int offset = (filterDeptUserReqeust.getPage() - 1) * filterDeptUserReqeust.getLimit();
+        filterDeptUserReqeust.pageDispose();
-            PageHelper.offsetPage(offset, filterDeptUserReqeust.getLimit());
-        }
         return deptUserDao.selectJoinDeptUser(filterDeptUserReqeust);
     }
 

src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java

@@ -31,10 +31,8 @@ public class InvBusUserServiceImpl extends ServiceImpl<InvBusUserDao, InvBusUser
         if (filterInvBusUserRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvBusUserRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit();
+        filterInvBusUserRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit());
-        }
         return invBusUserDao.filterInvBusUser(filterInvBusUserRequest);
     }
 
@@ -43,10 +41,8 @@ public class InvBusUserServiceImpl extends ServiceImpl<InvBusUserDao, InvBusUser
         if (filterInvBusUserRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvBusUserRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit();
+        filterInvBusUserRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit());
-        }
         return invBusUserDao.filterUnSelect(filterInvBusUserRequest);
     }
 

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -70,10 +70,8 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         if (filterInvSubWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvSubWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
+        filterInvSubWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
-        }
         List<InvWarehouseEntity> data = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
         return data;
     }
@@ -83,10 +81,8 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         if (filterInvWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
+        filterInvWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
-        }
         List<InvWarehouseEntity> data = invWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest);
         return data;
     }
@@ -208,10 +204,8 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         if (filterInvSubWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvSubWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
+        filterInvSubWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
-        }
         List<InvSubWarehouseResponse> data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
         return data;
     }

src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java

@@ -26,10 +26,8 @@ public class SysCustomConfigServiceImpl implements ISysCustomConfigService {
         if (request == null) {
             return Collections.emptyList();
         }
-        if (request.getPage() != null) {
+        // 分页处理
-            int offset = (request.getPage() - 1) * request.getLimit();
+        request.pageDispose();
-            PageHelper.offsetPage(offset, request.getLimit());
-        }
         return sysCustomConfigDao.filterSysCustomConfig(request);
     }
 

src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java

@@ -25,11 +25,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
 
     @Override
     public List<SysDictData> selectDictDataList(SysDictDataRequest sysDictDataRequest) {
-
+        // 分页处理
-        if (sysDictDataRequest.getPage() != null) {
+        sysDictDataRequest.pageDispose();
-            int offset = (sysDictDataRequest.getPage() - 1) * sysDictDataRequest.getLimit();
-            PageHelper.offsetPage(offset, sysDictDataRequest.getLimit());
-        }
 
         return baseMapper.selectDictDataList(sysDictDataRequest);
 

src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java

@@ -33,10 +33,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
 
     @Override
     public List<SysDictType> selectDictTypeList(SysDictTypeRequest sysDictTypeRequest) {
-        if (sysDictTypeRequest.getPage() != null) {
+        // 分页处理
-            int offset = (sysDictTypeRequest.getPage() - 1) * sysDictTypeRequest.getLimit();
+        sysDictTypeRequest.pageDispose();
-            PageHelper.offsetPage(offset, sysDictTypeRequest.getLimit());
-        }
         return baseMapper.selectDictTypeList(sysDictTypeRequest);
     }
 

src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java

@@ -25,8 +25,9 @@ public class SysPdaKeyServiceImpl implements SysPdaKeyService {
         if (filterDeviceKeyRequest == null) {
             return Collections.emptyList();
         }
-        int offset = (filterDeviceKeyRequest.getPage() - 1) * filterDeviceKeyRequest.getLimit();
+        // 分页处理
-        PageHelper.offsetPage(offset, filterDeviceKeyRequest.getLimit());
+        filterDeviceKeyRequest.pageDispose();
+
         return sysPdaKeyDao.findDeviceKey(filterDeviceKeyRequest);
     }
 

src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java

@@ -42,11 +42,8 @@ public class SysRoleServiceImpl implements ISysRoleService {
 
     @Override
     public List<SysRole> selectPageRoleList(FilterRoleRequest filterRoleRequest) {
-
+        // 分页处理
-        if (filterRoleRequest.getPage() != null) {
+        filterRoleRequest.pageDispose();
-            int offset = (filterRoleRequest.getPage() - 1) * filterRoleRequest.getLimit();
-            PageHelper.offsetPage(offset, filterRoleRequest.getLimit());
-        }
         return sysRoleMapper.selectRoleList(filterRoleRequest);
     }
 

src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java

@@ -25,8 +25,8 @@ public class UserRegisterServiceImpl implements UserRegisterService {
         if (userResisterFilterRequest == null) {
             return Collections.emptyList();
         }
-        int offset = (userResisterFilterRequest.getPage() - 1) * userResisterFilterRequest.getLimit();
+        // 分页处理
-        PageHelper.offsetPage(offset, userResisterFilterRequest.getLimit());
+        userResisterFilterRequest.pageDispose();
         return userRegisterDao.filterUserRegisters(userResisterFilterRequest);
     }
 

src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java

@@ -46,10 +46,8 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
         if (filterInvBusTypeRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvBusTypeRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvBusTypeRequest.getPage() - 1) * filterInvBusTypeRequest.getLimit();
+        filterInvBusTypeRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvBusTypeRequest.getLimit());
-        }
 
         return warehouseBussinessTypeDao.filterList(filterInvBusTypeRequest);
     }
@@ -84,10 +82,8 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
         if (filterInvLinkDataRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvLinkDataRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
+        filterInvLinkDataRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
-        }
         return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode());
     }
 

src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java

@@ -83,10 +83,8 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
         if (filterInvLinkDataRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInvLinkDataRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
+        filterInvLinkDataRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
-        }
         return warehouseUserDao.selectListkey(filterInvLinkDataRequest);
     }
     @Override

src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java

@@ -37,10 +37,8 @@ public class BasicCorpExportLogServiceImpl implements BasicCorpExportLogService
         if (filterCorpExportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterCorpExportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterCorpExportLogRequest.getPage() - 1) * filterCorpExportLogRequest.getLimit();
+        filterCorpExportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterCorpExportLogRequest.getLimit());
-        }
         List<BasicCorpsExportLogEntity> data = basicCorpExportLogDao.filterCorpExportLog(filterCorpExportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java

@@ -53,10 +53,8 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService
         if (filterCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterCorpImportLogRequest.getPage() - 1) * filterCorpImportLogRequest.getLimit();
+        filterCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterCorpImportLogRequest.getLimit());
-        }
         List<BasicCorpsImportLogEntity> data = basicCorpImportLogDao.filterImportLog(filterCorpImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -29,11 +29,8 @@ public class BasicCorpServiceImpl extends ServiceImpl<BasicCorpDao, BasicCorpEnt
         if (basicUnitMaintainFilterRequest == null) {
             return Collections.emptyList();
         }
-        if (basicUnitMaintainFilterRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit();
+        basicUnitMaintainFilterRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit());
-        }
-
         List<BasicCorpEntity> data = basicCorpDao.filterList(basicUnitMaintainFilterRequest);
         return data;
     }

src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java

@@ -49,10 +49,8 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, Basi
         if (basicHospTypeFilterRequest == null) {
             return Collections.emptyList();
         }
-        if (basicHospTypeFilterRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicHospTypeFilterRequest.getPage() - 1) * basicHospTypeFilterRequest.getLimit();
+        basicHospTypeFilterRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicHospTypeFilterRequest.getLimit());
-        }
         QueryWrapper<BasicHospTypeEntity> ew=new QueryWrapper<>();
         if (StrUtil.isNotEmpty(basicHospTypeFilterRequest.getName())){
             ew.like("name",basicHospTypeFilterRequest.getName());
@@ -187,10 +185,8 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, Basi
         if (filterUdiRelRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+        filterUdiRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
-        }
 
         List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
         return data;

src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java

@@ -26,10 +26,8 @@ public class BasicProductSetServiceImpl implements BasicProductSetService {
         if (filterBasicProductSetrequest == null) {
             return Collections.emptyList();
         }
-        if (filterBasicProductSetrequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterBasicProductSetrequest.getPage() - 1) * filterBasicProductSetrequest.getLimit();
+        filterBasicProductSetrequest.pageDispose();
-            PageHelper.offsetPage(offset, filterBasicProductSetrequest.getLimit());
-        }
         return basicProductSetDao.filterSetup(filterBasicProductSetrequest);
     }
 

src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java

@@ -37,10 +37,8 @@ public class BasicProductsExportLogServiceImpl implements BasicProductsExportLog
         if (filterInCodeLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInCodeLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit();
+        filterInCodeLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit());
-        }
         List<BasicProductsExportLogEntity> data = udiInfoExportLogDao.filterUdiInfoExportLog(filterInCodeLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java

@@ -38,10 +38,8 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport
         if (filterInCodeLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterInCodeLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit();
+        filterInCodeLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit());
-        }
         List<BasicProductsImportDetailEntity> data = udiInfoImportDao.filterUdiInfoImport(filterInCodeLogRequest);
         return data;
 

src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java

@@ -76,10 +76,8 @@ public class BasicProductsImportLogServiceImpl implements BasicProductsImportLog
         if (filterUdiIpLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiIpLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit();
+        filterUdiIpLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit());
-        }
         List<BasicProductsImportLogEntity> data = udiInfoImportLogDao.filterImportLog(filterUdiIpLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java

@@ -24,10 +24,8 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
         if (basicUnitMaintainFilterRequest == null) {
             return Collections.emptyList();
         }
-        if (basicUnitMaintainFilterRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit();
+        basicUnitMaintainFilterRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit());
-        }
 
         List<BasicUnitMaintainEntity> data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest);
         return data;

src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java

@@ -39,10 +39,8 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProdu
         if (basicInstrumentMaintainRequest == null) {
             return Collections.emptyList();
         }
-        if (basicInstrumentMaintainRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit();
+        basicInstrumentMaintainRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit());
-        }
 
         List<CompanyProductRelevanceResponse> data = companyProductRelevanceDao.filterUdiGp(basicInstrumentMaintainRequest);
         return data;

src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java

@@ -43,10 +43,8 @@ public class EntrustReceServiceImpl extends ServiceImpl<EntrustReceDao,EntrustRe
         if (basicEntrustRecRequest == null) {
             return Collections.emptyList();
         }
-        if (basicEntrustRecRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicEntrustRecRequest.getPage() - 1) * basicEntrustRecRequest.getLimit();
+        basicEntrustRecRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicEntrustRecRequest.getLimit());
-        }
         return entrustReceDao.filterEntrustRec(basicEntrustRecRequest);
     }
 
@@ -60,10 +58,8 @@ public class EntrustReceServiceImpl extends ServiceImpl<EntrustReceDao,EntrustRe
         if (basicEntrustRecRequest == null) {
             return Collections.emptyList();
         }
-        if (basicEntrustRecRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicEntrustRecRequest.getPage() - 1) * basicEntrustRecRequest.getLimit();
+        basicEntrustRecRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicEntrustRecRequest.getLimit());
-        }
         return entrustReceDao.downloadEntrustRec(basicEntrustRecRequest);
     }
 
@@ -73,10 +69,8 @@ public class EntrustReceServiceImpl extends ServiceImpl<EntrustReceDao,EntrustRe
         if (basicEntrustRecRequest == null) {
             return Collections.emptyList();
         }
-        if (basicEntrustRecRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicEntrustRecRequest.getPage() - 1) * basicEntrustRecRequest.getLimit();
+        basicEntrustRecRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicEntrustRecRequest.getLimit());
-        }
         List<EntrustReceResponse> entrustReceResponses = entrustReceDao.filterJoinEntrustRec(basicEntrustRecRequest);
         if (CollUtil.isNotEmpty(entrustReceResponses)) {
             //查询当前分库名称和委托验收分库名称

src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java

@@ -27,10 +27,8 @@ public class ProductInfoServiceImpl implements ProductInfoService {
         if (productInfoFilterRequest == null) {
             return Collections.emptyList();
         }
-        if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
+        // 分页处理
-            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        productInfoFilterRequest.pageDispose();
-            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
-        }
 
         List<ProductInfoEntity> data = productInfoDao.filterProductGroup(productInfoFilterRequest);
         return data;

src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java

@@ -28,10 +28,8 @@ public class UdiCompanyServiceImpl implements UdiCompanyService {
 
     @Override
     public List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest) {
-        if (udiCompanyRequest.getPage() != null && udiCompanyRequest.getLimit() != null) {
+        // 分页处理
-            int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit();
+        udiCompanyRequest.pageDispose();
-            PageHelper.offsetPage(offset, udiCompanyRequest.getLimit());
-        }
         return udiCompanyDao.filterUdiCompany(udiCompanyRequest);
     }
 

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -68,10 +68,8 @@ public class UdiProductServiceImpl implements UdiProductService {
         if (filterUdiRelRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+        filterUdiRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
-        }
 
         List<UdiProductEntity> data = udiProductDao.filterUdiInfo(filterUdiRelRequest);
         return data;

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -37,10 +37,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         if (filterUdiRelRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+        filterUdiRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
-        }
         List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
         return data;
     }
@@ -52,10 +50,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         if (filterUdiRelRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+        filterUdiRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
-        }
         List<UdiRelevanceResponse> data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest);
         return data;
 
@@ -66,10 +62,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         if (filterUdiRelRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+        filterUdiRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
-        }
         List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest);
         return data;
     }
@@ -145,10 +139,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         if (filterUdiRelRequest == null) {
             return Collections.emptyList();
         }
-        if (filterUdiRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+        filterUdiRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
-        }
 
         List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
         return data;

src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java

@@ -27,10 +27,8 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
         if (basicInstrumentMaintainRequest == null) {
             return Collections.emptyList();
         }
-        if (basicInstrumentMaintainRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit();
+        basicInstrumentMaintainRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit());
-        }
 
         List<UdiRlSupResponse> data = udiRlSupDao.filterUdiGp(basicInstrumentMaintainRequest);
         return data;
@@ -41,10 +39,8 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
         if (filterCompanyProductRelevanceRequest == null) {
             return Collections.emptyList();
         }
-        if (filterCompanyProductRelevanceRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit();
+        filterCompanyProductRelevanceRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit());
-        }
         return udiRlSupDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
     }
 
@@ -58,8 +54,8 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
         if (filterCompanyProductRelevanceRequest == null) {
             return Collections.emptyList();
         }
-        int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit();
+        // 分页处理
-        PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit());
+        filterCompanyProductRelevanceRequest.pageDispose();
         List<UdiRlSupEntity> companyEntities = udiRlSupDao.getCompanyProductRelevance(filterCompanyProductRelevanceRequest);
         return companyEntities;
     }

src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java

@@ -154,10 +154,8 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
         if (relCodeBatchRequest == null) {
             return Collections.emptyList();
         }
-        if (relCodeBatchRequest.getPage() != null) {
+        // 分页处理
-            int offset = (relCodeBatchRequest.getPage() - 1) * relCodeBatchRequest.getLimit();
+        relCodeBatchRequest.pageDispose();
-            PageHelper.offsetPage(offset, relCodeBatchRequest.getLimit());
-        }
         return this.baseMapper.filterList(relCodeBatchRequest);
     }
 

src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java

@@ -108,10 +108,8 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
         if (relCodeDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (relCodeDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (relCodeDetailRequest.getPage() - 1) * relCodeDetailRequest.getLimit();
+        relCodeDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, relCodeDetailRequest.getLimit());
-        }
         return this.baseMapper.filterList(relCodeDetailRequest);
     }
 

src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java

@@ -34,10 +34,8 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper, IoCodeL
         if (ioCodeLostRequest == null) {
             return Collections.emptyList();
         }
-        if (ioCodeLostRequest.getPage() != null) {
+        // 分页处理
-            int offset = (ioCodeLostRequest.getPage() - 1) * ioCodeLostRequest.getLimit();
+        ioCodeLostRequest.pageDispose();
-            PageHelper.offsetPage(offset, ioCodeLostRequest.getLimit());
-        }
         return codeLostEntityMapper.selectLost(ioCodeLostRequest);
     }
 

src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java

@@ -28,10 +28,8 @@ public class IoCodeRelServiceImpl extends ServiceImpl<IoCodeRelMapper, IoCodeRel
         if (ioOrderRelRequest == null) {
             return Collections.emptyList();
         }
-        if (ioOrderRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (ioOrderRelRequest.getPage() - 1) * ioOrderRelRequest.getLimit();
+        ioOrderRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, ioOrderRelRequest.getLimit());
-        }
         return ioCodeRelMapper.selectIoCodeRelList(ioOrderRelRequest);
     }
 
@@ -84,10 +82,8 @@ public class IoCodeRelServiceImpl extends ServiceImpl<IoCodeRelMapper, IoCodeRel
         if (ioOrderRelRequest == null) {
             return Collections.emptyList();
         }
-        if (ioOrderRelRequest.getPage() != null) {
+        // 分页处理
-            int offset = (ioOrderRelRequest.getPage() - 1) * ioOrderRelRequest.getLimit();
+        ioOrderRelRequest.pageDispose();
-            PageHelper.offsetPage(offset, ioOrderRelRequest.getLimit());
-        }
         return ioCodeRelMapper.selectIoCodeRelDetailList(ioOrderRelRequest);
     }
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java

@@ -110,27 +110,21 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
     }
 
     public List<IoOrderInvoiceResponse> filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) {
-        if (orderInvoiceRequest.getPage() != null) {
+        // 分页处理
-            int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();
+        orderInvoiceRequest.pageDispose();
-            PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit());
-        }
         return ioOrderInvoiceMapper.filterGroupBy(orderInvoiceRequest);
     }
 
     public List<IoOrderInvoiceResponse> filterInvoice(IoOrderInvoiceRequest orderInvoiceRequest) {
-        if (orderInvoiceRequest.getPage() != null) {
+        // 分页处理
-            int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();
+        orderInvoiceRequest.pageDispose();
-            PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit());
-        }
         return ioOrderInvoiceMapper.filterInvoice(orderInvoiceRequest);
     }
 
 
     public List<IoOrderResponse> filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest) {
-        if (orderInvoiceRequest.getPage() != null) {
+        // 分页处理
-            int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();
+        orderInvoiceRequest.pageDispose();
-            PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit());
-        }
         return ioOrderInvoiceMapper.filterByInvoiceCode(orderInvoiceRequest);
     }
 

src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java

@@ -24,10 +24,8 @@ public class InnerOrderDetailServiceImpl implements InnerOrderDetailService {
         if (innerOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (innerOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (innerOrderDetailRequest.getPage() - 1) * innerOrderDetailRequest.getLimit();
+        innerOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, innerOrderDetailRequest.getLimit());
-        }
         List<innerOrderDetailResponse> data = innerOrderDetailDao.joinQueryList(innerOrderDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java

@@ -40,10 +40,8 @@ public class InnerOrderServiceImpl implements InnerOrderService {
         if (innerOrderRequest == null) {
             return Collections.emptyList();
         }
-        if (innerOrderRequest.getPage() != null) {
+        // 分页处理
-            int offset = (innerOrderRequest.getPage() - 1) * innerOrderRequest.getLimit();
+        innerOrderRequest.pageDispose();
-            PageHelper.offsetPage(offset, innerOrderRequest.getLimit());
-        }
         List<InnerOrderEntity> data = innerOrderDao.queryPageList(innerOrderRequest);
         return data;
     }

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -133,10 +133,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         if (filterinnerOrderprintRequest == null) {
             return Collections.emptyList();
         }
-        if (filterinnerOrderprintRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterinnerOrderprintRequest.getPage() - 1) * filterinnerOrderprintRequest.getLimit();
+        filterinnerOrderprintRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit());
-        }
 
         List<InnerOrderPrintResponse> data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest);
         return data;

src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java

@@ -88,10 +88,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf
 
     @Override
     public List<SysLogininfor> selectLogininforList(FilterLoginLogRequest logininfor) {
-        if (logininfor.getPage() != null) {
+        // 分页处理
-            int offset = (logininfor.getPage() - 1) * logininfor.getLimit();
+        logininfor.pageDispose();
-            PageHelper.offsetPage(offset, logininfor.getLimit());
-        }
         return baseMapper.selectLogininforList(logininfor);
     }
 

src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java

@@ -44,10 +44,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService, OperLogService
 
     @Override
     public List<SysOperLog> selectOperLogList(FilterOperLogRequest filterOperLogRequest) {
-        if (filterOperLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterOperLogRequest.getPage() - 1) * filterOperLogRequest.getLimit();
+        filterOperLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterOperLogRequest.getLimit());
-        }
         return baseMapper.selectList(filterOperLogRequest);
     }
 

src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java

@@ -27,10 +27,8 @@ public class PurApplyDetailImplService implements PurApplyDetailService {
         if (purApplyRequest == null) {
             return Collections.emptyList();
         }
-        if (purApplyRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit();
+        purApplyRequest.pageDispose();
-            PageHelper.offsetPage(offset, purApplyRequest.getLimit());
-        }
         List<PurApplyDetailEntity> data = purApplyDetailDao.queryPageList(purApplyRequest);
         return data;
     }
@@ -51,10 +49,8 @@ public class PurApplyDetailImplService implements PurApplyDetailService {
         if (purApplyRequest == null) {
             return Collections.emptyList();
         }
-        if (purApplyRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit();
+        purApplyRequest.pageDispose();
-            PageHelper.offsetPage(offset, purApplyRequest.getLimit());
-        }
         List<PurOrderDetailResponse> data = purApplyDetailDao.joinQueryList(purApplyRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java

@@ -25,10 +25,8 @@ public class PurApplyServiceImpl implements PurApplyService {
         if (purApplyRequest == null) {
             return Collections.emptyList();
         }
-        if (purApplyRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit();
+        purApplyRequest.pageDispose();
-            PageHelper.offsetPage(offset, purApplyRequest.getLimit());
-        }
         List<PurApplyResponse> data = purApplyDao.queryPageList(purApplyRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java

@@ -27,10 +27,8 @@ public class PurArrivalDetailServiceImpl implements PurArrivalDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurArrivalDetailResponse> data = purArrivalDetailDao.joinQueryList(purOrderDetailRequest);
         return data;
     }
@@ -48,10 +46,8 @@ public class PurArrivalDetailServiceImpl implements PurArrivalDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurArrivalDetailEntity> data = purArrivalDetailDao.queryPageList(purOrderDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java

@@ -27,10 +27,8 @@ public class PurArrivalServiceImpl implements PurArrivalService {
         if (purArrivalRequest == null) {
             return Collections.emptyList();
         }
-        if (purArrivalRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purArrivalRequest.getPage() - 1) * purArrivalRequest.getLimit();
+        purArrivalRequest.pageDispose();
-            PageHelper.offsetPage(offset, purArrivalRequest.getLimit());
-        }
         List<PurArrivalResponse> data = purArrivalDao.queryPageList(purArrivalRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java

@@ -26,10 +26,8 @@ public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurDeliveryDetailResponse> data = purDeliveryDetailDao.joinQueryList(purOrderDetailRequest);
         return data;
     }
@@ -47,10 +45,8 @@ public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurDeliveryDetailEntity> data = purDeliveryDetailDao.queryPageList(purOrderDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java

@@ -36,10 +36,8 @@ public class PurDeliveryServiceImpl implements PurDeliveryService {
         if (purDeliveryRequest == null) {
             return Collections.emptyList();
         }
-        if (purDeliveryRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purDeliveryRequest.getPage() - 1) * purDeliveryRequest.getLimit();
+        purDeliveryRequest.pageDispose();
-            PageHelper.offsetPage(offset, purDeliveryRequest.getLimit());
-        }
         List<PurDeliveryResponse> data = purDeliveryDao.queryPageList(purDeliveryRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java

@@ -28,10 +28,8 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurOrderDetailResponse> data = purOrderDetailDao.joinQueryList(purOrderDetailRequest);
         return data;
     }
@@ -41,10 +39,8 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurOrderDetailResponse> data = purOrderDetailDao.joinQueryDrugList(purOrderDetailRequest);
         return data;
     }
@@ -62,10 +58,8 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurOrderDetailEntity> data = purOrderDetailDao.queryPageList(purOrderDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java

@@ -45,10 +45,8 @@ public class PurOrderServiceImpl implements PurOrderService {
         if (purOrderRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderRequest.getPage() - 1) * purOrderRequest.getLimit();
+        purOrderRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderRequest.getLimit());
-        }
         List<PurOrderResponse> data = purOrderDao.queryPageList(purOrderRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java

@@ -27,10 +27,8 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService {
         if (purApplyRequest == null) {
             return Collections.emptyList();
         }
-        if (purApplyRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit();
+        purApplyRequest.pageDispose();
-            PageHelper.offsetPage(offset, purApplyRequest.getLimit());
-        }
         List<PurOrderDetailResponse> data = purPlanDetailDao.joinQueryList(purApplyRequest);
         return data;
     }
@@ -48,10 +46,8 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService {
         if (purPlanDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purPlanDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purPlanDetailRequest.getPage() - 1) * purPlanDetailRequest.getLimit();
+        purPlanDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purPlanDetailRequest.getLimit());
-        }
         List<PurPlanDetailEntity> data = purPlanDetailDao.queryPageList(purPlanDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java

@@ -25,10 +25,8 @@ public class PurPlanServiceImpl implements PurPlanService {
         if (purPlanRequest == null) {
             return Collections.emptyList();
         }
-        if (purPlanRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purPlanRequest.getPage() - 1) * purPlanRequest.getLimit();
+        purPlanRequest.pageDispose();
-            PageHelper.offsetPage(offset, purPlanRequest.getLimit());
-        }
         List<PurPlanResponse> data = purPlanDao.queryPageList(purPlanRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java

@@ -28,10 +28,8 @@ public class PurReturnedDetailServiceImpl implements PurReturnedDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurReturnedDetailResponse> data = purReturnedDetailDao.joinQueryList(purOrderDetailRequest);
         return data;
     }
@@ -49,10 +47,8 @@ public class PurReturnedDetailServiceImpl implements PurReturnedDetailService {
         if (purOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (purOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+        purOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
-        }
         List<PurReturnedDetailEntity> data = purReturnedDetailDao.queryPageList(purOrderDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java

@@ -25,10 +25,8 @@ public class PurReturnedServiceImpl implements PurReturnedService {
         if (purReturnedRequest == null) {
             return Collections.emptyList();
         }
-        if (purReturnedRequest.getPage() != null) {
+        // 分页处理
-            int offset = (purReturnedRequest.getPage() - 1) * purReturnedRequest.getLimit();
+        purReturnedRequest.pageDispose();
-            PageHelper.offsetPage(offset, purReturnedRequest.getLimit());
-        }
         List<PurReturnedResponse> data = purReturnedDao.queryPageList(purReturnedRequest);
         return data;
     }

src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java

@@ -41,10 +41,8 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
         if (filterSupCertRequest == null) {
             return Collections.emptyList();
         }
-        if (filterSupCertRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
+        filterSupCertRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
-        }
         return supCertDao.filterCompanyCert(filterSupCertRequest);
     }
 
@@ -53,10 +51,8 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
         if (filterSupCertRequest == null) {
             return Collections.emptyList();
         }
-        if (filterSupCertRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
+        filterSupCertRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
-        }
 
         List<SupCertEntity> companyEntities = supCertDao.getCompanyCert(filterSupCertRequest);
         return companyEntities;
@@ -68,10 +64,8 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
         if (filterSupCertRequest == null) {
             return Collections.emptyList();
         }
-        if (filterSupCertRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
+        filterSupCertRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
-        }
 
         List<SupCertEntity> companyEntities = supCertDao.getCompanyCert(filterSupCertRequest);
         return companyEntities;

src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java

@@ -26,10 +26,8 @@ public class SupCertSetServiceImpl extends ServiceImpl<SupCertSetDao, SupCertSet
         if (filterCertSetsRequest == null) {
             return Collections.emptyList();
         }
-        if (filterCertSetsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterCertSetsRequest.getPage() - 1) * filterCertSetsRequest.getLimit();
+        filterCertSetsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterCertSetsRequest.getLimit());
-        }
         return supCertSetDao.filterCertSets(filterCertSetsRequest);
 
     }

src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java

@@ -52,10 +52,8 @@ public class SupManufacturerServiceImpl extends ServiceImpl<SupManufacturerDao,
         if (filterSupManufacturerRequest == null) {
             return Collections.emptyList();
         }
-        if (filterSupManufacturerRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit();
+        filterSupManufacturerRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit());
-        }
 
         List<SupManufacturerEntity> companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest);
         return companyEntities;

src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java

@@ -55,10 +55,8 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
         if (filterPoductRequest == null) {
             return Collections.emptyList();
         }
-        if (filterPoductRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit();
+        filterPoductRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterPoductRequest.getLimit());
-        }
         List<SupProductResponse> companyEntities = supProductDao.getRegistration(filterPoductRequest);
         return companyEntities;
     }

src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java

@@ -27,10 +27,8 @@ public class BasicDownloadServiceImpl extends ServiceImpl<BasicDownloadDao,Basic
         if (basicDownloadRequest == null) {
             return Collections.emptyList();
         }
-        if (basicDownloadRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicDownloadRequest.getPage() - 1) * basicDownloadRequest.getLimit();
+        basicDownloadRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicDownloadRequest.getLimit());
-        }
         return basicDownloadDao.filterDownloadStatus(basicDownloadRequest);
     }
 

src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java

@@ -38,10 +38,8 @@ public class BasicExportServiceImpl extends ServiceImpl<BasicExportDao, BasicExp
         if (basicExportStatusRequest == null) {
             return Collections.emptyList();
         }
-        if (basicExportStatusRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicExportStatusRequest.getPage() - 1) * basicExportStatusRequest.getLimit();
+        basicExportStatusRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicExportStatusRequest.getLimit());
-        }
         return basicExportDao.filterExportStatus(basicExportStatusRequest);
     }
 

src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java

@@ -29,10 +29,8 @@ public class ClassifyCodeServiceImpl implements ClassifyCodeService {
         if (filterClassifyCodeRequest == null) {
             return Collections.emptyList();
         }
-        if (filterClassifyCodeRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterClassifyCodeRequest.getPage() - 1) * filterClassifyCodeRequest.getLimit();
+        filterClassifyCodeRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterClassifyCodeRequest.getLimit());
-        }
 
         if (StrUtil.isNotEmpty(filterClassifyCodeRequest.getInFilter())) {
             filterClassifyCodeRequest.setInFilterList(Arrays.asList(filterClassifyCodeRequest.getInFilter().split(",")));

src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java

@@ -25,10 +25,8 @@ public class SysMenuHelpServiceImpl implements SysMenuHelpService {
 
     @Override
     public List<SysMenuHelpEntity> MenuHelpList(SysMenuHelpRequest sysMenuHelpRequest) {
-        if (sysMenuHelpRequest.getPage() != null) {
+        // 分页处理
-            int offset = (sysMenuHelpRequest.getPage() - 1) * sysMenuHelpRequest.getLimit();
+        sysMenuHelpRequest.pageDispose();
-            PageHelper.offsetPage(offset, sysMenuHelpRequest.getLimit());
-        }
         return sysMenuHelpMapper.selectMenuHelpList(sysMenuHelpRequest);
     }
 

src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java

@@ -23,10 +23,8 @@ public class SysRemindMsgServiceImpl implements SysRemindMsgService {
     @Override
     public List<SysRemindMsgEntity> filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest) {
 
-        if (filterSysRemindMsgRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSysRemindMsgRequest.getPage() - 1) * filterSysRemindMsgRequest.getLimit();
+        filterSysRemindMsgRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSysRemindMsgRequest.getLimit());
-        }
         return sysRemindMsgMapper.filterList(filterSysRemindMsgRequest);
 
     }

src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java

@@ -20,10 +20,8 @@ public class SysRemindSetServiceImpl implements SysRemindSetService {
 
     @Override
     public List<SysRemindSetEntity> filterList(FilterSysRemindSetRequest filterSysRemindSetRequest) {
-        if (filterSysRemindSetRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSysRemindSetRequest.getPage() - 1) * filterSysRemindSetRequest.getLimit();
+        filterSysRemindSetRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSysRemindSetRequest.getLimit());
-        }
         return sysRemindSetMapper.filterList(filterSysRemindSetRequest);
     }
 }

src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java

@@ -27,10 +27,10 @@ public class SystemPDFModuleServiceImpl extends ServiceImpl<SystemPDFModuleDao,
 
 
     @Override
-    public List<SystemPDFModuleEntity> queryPage(FilterPdfModuleRequest FilterPDFModuleRequest) {
+    public List<SystemPDFModuleEntity> queryPage(FilterPdfModuleRequest filterPdfModuleRequest) {
-        int offset = (FilterPDFModuleRequest.getPage() - 1) * FilterPDFModuleRequest.getLimit();
+        // 分页处理
-        PageHelper.offsetPage(offset, FilterPDFModuleRequest.getLimit());
+        filterPdfModuleRequest.pageDispose();
-        List<SystemPDFModuleEntity> list = systemPDFModuleDao.queryPage(FilterPDFModuleRequest);
+        List<SystemPDFModuleEntity> list = systemPDFModuleDao.queryPage(filterPdfModuleRequest);
         return list;
     }
 

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java

@@ -23,10 +23,8 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
 
     @Override
     public List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest) {
-        if (systemPDFModuleRequest.getPage() != null) {
+        // 分页处理
-            int offset = (systemPDFModuleRequest.getPage() - 1) * systemPDFModuleRequest.getLimit();
+        systemPDFModuleRequest.pageDispose();
-            PageHelper.offsetPage(offset, systemPDFModuleRequest.getLimit());
-        }
         return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest);
     }
 

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java

@@ -20,10 +20,10 @@ public class SystemPDFTemplateServiceImpl extends ServiceImpl<SystemPDFTemplateD
     SystemPDFTemplateDao systemPDFTemplateDao;
 
     @Override
-    public List<SystemPDFTemplateEntity> queryPage(FilterPdfTemplateRequest FilterPdfTemplateRequest) {
+    public List<SystemPDFTemplateEntity> queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest) {
-        int offset = (FilterPdfTemplateRequest.getPage() - 1) * FilterPdfTemplateRequest.getLimit();
+        // 分页处理
-        PageHelper.offsetPage(offset, FilterPdfTemplateRequest.getLimit());
+        filterPdfTemplateRequest.pageDispose();
-        List<SystemPDFTemplateEntity> list = systemPDFTemplateDao.queryPage(FilterPdfTemplateRequest);
+        List<SystemPDFTemplateEntity> list = systemPDFTemplateDao.queryPage(filterPdfTemplateRequest);
         return list;
     }
 

src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java

@@ -24,12 +24,10 @@ public class SystemParamConfigServiceImpl extends ServiceImpl<SystemParamConfigD
     SystemParamConfigDao systemParamConfigDao;
 
     @Override
-    public List<SystemParamConfigEntity> queryPage(FilterParamConfigRequest FilterParamConfigRequest) {
+    public List<SystemParamConfigEntity> queryPage(FilterParamConfigRequest filterParamConfigRequest) {
-        if (FilterParamConfigRequest.getPage() != null) {
+        // 分页处理
-            int offset = (FilterParamConfigRequest.getPage() - 1) * FilterParamConfigRequest.getLimit();
+        filterParamConfigRequest.pageDispose();
-            PageHelper.offsetPage(offset, FilterParamConfigRequest.getLimit());
+        List<SystemParamConfigEntity> list = systemParamConfigDao.queryPage(filterParamConfigRequest);
-        }
-        List<SystemParamConfigEntity> list = systemParamConfigDao.queryPage(FilterParamConfigRequest);
         return list;
     }
 

src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java

@@ -24,10 +24,8 @@ public class ThirdSysApiServiceImpl implements ThirdSysApiService {
         if (filterSysApiRequest == null) {
             return Collections.emptyList();
         }
-        if (filterSysApiRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterSysApiRequest.getPage() - 1) * filterSysApiRequest.getLimit();
+        filterSysApiRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterSysApiRequest.getLimit());
-        }
         return thirdSysApiDao.findSysApi(filterSysApiRequest);
     }
 

src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java

@@ -16,10 +16,8 @@ public class BasicInsMaterialService extends ServiceImpl<BasicInsMaterialMapper,
         if (thrInsMaterialFeeRequest == null) {
             return Collections.emptyList();
         }
-        if (thrInsMaterialFeeRequest.getPage() != null) {
+        // 分页处理
-            int offset = (thrInsMaterialFeeRequest.getPage() - 1) * thrInsMaterialFeeRequest.getLimit();
+        thrInsMaterialFeeRequest.pageDispose();
-            PageHelper.offsetPage(offset, thrInsMaterialFeeRequest.getLimit());
-        }
         return super.baseMapper.filterList(thrInsMaterialFeeRequest);
 
     }

src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java

@@ -226,10 +226,8 @@ public class ThirdAliDrugService extends ServiceImpl<ThirdAliDrugMapper, ThirdAl
         if (thirdAliDrug == null) {
             return Collections.emptyList();
         }
-        if (thirdAliDrug.getPage() != null) {
+        // 分页处理
-            int offset = (thirdAliDrug.getPage() - 1) * thirdAliDrug.getLimit();
+        thirdAliDrug.pageDispose();
-            PageHelper.offsetPage(offset, thirdAliDrug.getLimit());
-        }
         return this.baseMapper.filterList(thirdAliDrug);
     }
 

src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java

@@ -21,10 +21,8 @@ public class ThrHslbService extends ServiceImpl<ThrHslbMapper, ThrHslbEntity> {
         if (filterThrHslbRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrHslbRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrHslbRequest.getPage() - 1) * filterThrHslbRequest.getLimit();
+        filterThrHslbRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrHslbRequest.getLimit());
-        }
         List<ThrHslbEntity> data = thrHslbMapper.getHslbs(filterThrHslbRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java

@@ -34,10 +34,8 @@ public class ThrManufacturerService extends ServiceImpl<ThrManufacturerMapper, T
         if (filterThrCorpRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpRequest.getPage() - 1) * filterThrCorpRequest.getLimit();
+        filterThrCorpRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpRequest.getLimit());
-        }
         List<ThrManufacturerEntity> data = thrManufacturerMapper.filterThrManu(filterThrCorpRequest);
         return data;
     }
@@ -101,10 +99,8 @@ public class ThrManufacturerService extends ServiceImpl<ThrManufacturerMapper, T
         if (basicProducstRequest == null) {
             return Collections.emptyList();
         }
-        if (basicProducstRequest.getPage() != null) {
+        // 分页处理
-            int offset = (basicProducstRequest.getPage() - 1) * basicProducstRequest.getLimit();
+        basicProducstRequest.pageDispose();
-            PageHelper.offsetPage(offset, basicProducstRequest.getLimit());
-        }
         List<ThrManufacturerEntity> data = thrManufacturerMapper.getProductTypes(basicProducstRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java

@@ -20,10 +20,8 @@ public class ThrProductTypeService extends ServiceImpl<ThrProductTypeMapper, Thr
         if (filterThrProductTypeRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductTypeRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductTypeRequest.getPage() - 1) * filterThrProductTypeRequest.getLimit();
+        filterThrProductTypeRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductTypeRequest.getLimit());
-        }
         List<ThrProductTypeEntity> data = thrProductTypeMapper.getProductTypes(filterThrProductTypeRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java

@@ -38,10 +38,8 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService {
         if (filterThrCorpExportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpExportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpExportLogRequest.getPage() - 1) * filterThrCorpExportLogRequest.getLimit();
+        filterThrCorpExportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpExportLogRequest.getLimit());
-        }
         List<ThrCorpExportLogEntity> data = thrCorpExportLogDao.filterThrCorpExportLog(filterThrCorpExportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java

@@ -26,10 +26,8 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrCorpImportDetailEntity> data = thrCorpImportDetailDao.filterCorpDetailImport(filterThrCorpImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java

@@ -38,10 +38,8 @@ public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService {
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrCorpImportLogEntity> data = thrCorpImportLogDao.filterThrCorpImportLog(filterThrCorpImportLogRequest);
         return data;
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java

@@ -28,10 +28,8 @@ public class ThrCorpServiceImpl implements ThrCorpService {
         if (filterThrCorpRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpRequest.getPage() - 1) * filterThrCorpRequest.getLimit();
+        filterThrCorpRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpRequest.getLimit());
-        }
         List<ThrCorpsResponse> data = thrCorpDao.filterThrCorps(filterThrCorpRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java

@@ -47,10 +47,8 @@ public class ThrDeptServiceImpl implements ThrDeptService {
         if (filterThrDeptRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrDeptRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrDeptRequest.getPage() - 1) * filterThrDeptRequest.getLimit();
+        filterThrDeptRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrDeptRequest.getLimit());
-        }
         return thrDeptDao.filterThrInvWarehouse(filterThrDeptRequest);
     }
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java

@@ -26,10 +26,8 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrInvProductsImportDetailEntity> data = thrInvProductsDetailDao.filterInvProductsDetailImport(filterThrCorpImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java

@@ -39,10 +39,8 @@ public class ThrInvProductsExportLogServiceImpl implements ThrInvProductsExportL
         if (filterThrCorpExportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpExportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpExportLogRequest.getPage() - 1) * filterThrCorpExportLogRequest.getLimit();
+        filterThrCorpExportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpExportLogRequest.getLimit());
-        }
         List<ThrInvProductsExportLogEntity> data = thrInvProductsExportLogDao.filterThrInvProductsExportLog(filterThrCorpExportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java

@@ -29,10 +29,8 @@ public class ThrInvProductsImportLogServiceImpl implements ThrInvProductsImportL
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrInvProductsImportLogEntity> data = thrInvProductsImportLogDao.filterThrInvProductsImportLog(filterThrCorpImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java

@@ -26,10 +26,8 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService {
         if (filterThrInvProductsRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrInvProductsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrInvProductsRequest.getPage() - 1) * filterThrInvProductsRequest.getLimit();
+        filterThrInvProductsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrInvProductsRequest.getLimit());
-        }
         List<ThrInvProductsEntity> data = thrInvProductsDao.filterThrInvProductss(filterThrInvProductsRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java

@@ -44,10 +44,8 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
         if (filterThrSubInvWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrSubInvWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit();
+        filterThrSubInvWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit());
-        }
         return thrInvWarehouseDao.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
     }
 
@@ -61,10 +59,8 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
         if (filterThrSubInvWarehouseRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrSubInvWarehouseRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit();
+        filterThrSubInvWarehouseRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit());
-        }
         return thrInvWarehouseDao.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
     }
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java

@@ -30,10 +30,8 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService {
         if (filterThrOrderDetailRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrOrderDetailRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrOrderDetailRequest.getPage() - 1) * filterThrOrderDetailRequest.getLimit();
+        filterThrOrderDetailRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrOrderDetailRequest.getLimit());
-        }
         List<ThrOrderDetailEntity> data = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java

@@ -35,10 +35,8 @@ public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService {
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrOrderExportLogEntity> data = thrOrderExportLogDao.filterThrOrderExportLog(filterThrCorpImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java

@@ -24,10 +24,8 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrOrderImportDetailEntity> data = thrOrderImportDetailDao.filterOrderdDetailImport(filterThrCorpImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java

@@ -55,10 +55,8 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService {
         if (filterThrCorpImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrCorpImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit();
+        filterThrCorpImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit());
-        }
         List<ThrOrderImportLogEntity> data = thrOrderImportLogDao.filterThrOrderImportLog(filterThrCorpImportLogRequest);
         return data;
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java

@@ -35,10 +35,8 @@ public class ThrOrderServiceImpl implements ThrOrderService {
         if (filterThrOrderRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrOrderRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrOrderRequest.getPage() - 1) * filterThrOrderRequest.getLimit();
+        filterThrOrderRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrOrderRequest.getLimit());
-        }
         List<ThrOrderEntity> data = thrOrderDao.filterThrOrder(filterThrOrderRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java

@@ -48,10 +48,8 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
 
 
     public List<ThrProductsAddDiResponse> filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest) {
-        if (null != filterThrProductsRequest && filterThrProductsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+        filterThrProductsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
-        }
         List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest);
 
         if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) {

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java

@@ -25,10 +25,8 @@ public class ThrProductsAddServiceImpl implements ThrProductsAddService {
         if (filterThrProductsRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+        filterThrProductsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
-        }
         List<ThrProductsAddEntity> data = thrProductsAddDao.filterThrProductsRequest(filterThrProductsRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java

@@ -37,10 +37,8 @@ public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogServ
         if (filterThrProductsExportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsExportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsExportLogRequest.getPage() - 1) * filterThrProductsExportLogRequest.getLimit();
+        filterThrProductsExportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsExportLogRequest.getLimit());
-        }
         List<ThrProductsExportLogEntity> data = thrProductsExportLogDao.filterThrProductsExportLog(filterThrProductsExportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java

@@ -24,10 +24,8 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta
         if (filterThrProductsImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsImportLogRequest.getPage() - 1) * filterThrProductsImportLogRequest.getLimit();
+        filterThrProductsImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsImportLogRequest.getLimit());
-        }
         List<ThrProductsImportDetailEntity> data = thrProductsImportDetailDao.filterProductsDetailImport(filterThrProductsImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java

@@ -23,10 +23,8 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ
         if (filterThrProductsImportLogRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsImportLogRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsImportLogRequest.getPage() - 1) * filterThrProductsImportLogRequest.getLimit();
+        filterThrProductsImportLogRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsImportLogRequest.getLimit());
-        }
         List<ThrProductsImportLogEntity> data = thrProductsImportLogDao.filterThrPorductsImportLog(filterThrProductsImportLogRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -52,10 +52,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         if (filterThrProductsRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+        filterThrProductsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
-        }
         List<ThrProductsEntity> data = thrProductsDao.filterThrProducts(filterThrProductsRequest);
         return data;
     }
@@ -64,10 +62,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         if (filterThrProductsRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+        filterThrProductsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
-        }
         List<ThrProductsEntity> data = thrProductsDao.filterThrProducts1(filterThrProductsRequest);
         return data;
     }
@@ -77,10 +73,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         if (filterThrProductsRequest == null) {
             return Collections.emptyList();
         }
-        if (filterThrProductsRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
+        filterThrProductsRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
-        }
         return thrProductsDao.filterJoinThrProducts(filterThrProductsRequest);
     }
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java

@@ -41,11 +41,8 @@ public class ThrSystemDetailServiceImpl implements ThrSystemDetailService {
         if (filterBasicThirdSysDetailRequest == null) {
             return Collections.emptyList();
         }
-
+        // 分页处理
-        if (filterBasicThirdSysDetailRequest.getPage() != null) {
+        filterBasicThirdSysDetailRequest.pageDispose();
-            int offset = (filterBasicThirdSysDetailRequest.getPage() - 1) * filterBasicThirdSysDetailRequest.getLimit();
-            PageHelper.offsetPage(offset, filterBasicThirdSysDetailRequest.getLimit());
-        }
         List<ThrSystemDetailEntity> data = thrSystemDetailDao.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest);
         return data;
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java

@@ -50,11 +50,8 @@ public class ThrSystemServiceImpl implements ThrSystemService {
         if (filterBasicThirdSysRequest == null) {
             return Collections.emptyList();
         }
-
+        // 分页处理
-        if (filterBasicThirdSysRequest.getPage() != null) {
+        filterBasicThirdSysRequest.pageDispose();
-            int offset = (filterBasicThirdSysRequest.getPage() - 1) * filterBasicThirdSysRequest.getLimit();
-            PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit());
-        }
         List<ThrSystemEntity> data = thrSystemDao.filterBasicThiSys(filterBasicThirdSysRequest);
         //查询本系统的授权码
         AuthLicense license = authLicenseDao.selectLicenseByName("UDI管理系统");

src/main/java/com/glxp/api/util/page/ListPageRequest.java

@@ -1,6 +1,8 @@
 package com.glxp.api.util.page;
 
+import com.github.pagehelper.PageHelper;
 import lombok.Data;
+import lombok.Value;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -23,4 +25,11 @@ public class ListPageRequest {
 
     private String orderBy;
     private String sort;
+
+    public void pageDispose(){
+        if (this.getPage() != null && this.getLimit() != null) {
+            int offset = (this.getPage() - 1) * this.getLimit();
+            PageHelper.offsetPage(offset, this.getLimit());
+        }
+    }
 }