service 层代码优化

（分页统一封装优化）
(几个文件优化)

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

@@ -145,8 +145,6 @@ public class AuthAdminServiceImpl implements AuthAdminService {
 
     @Override
     public List<AuthAdmin> selectNotSelectUser(FilterNoSelectUserRequest filterNoSelectUserRequest) {
-
-
         if (filterNoSelectUserRequest == null) {
             return Collections.emptyList();
         }

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

@@ -21,8 +21,6 @@ public class AuthRoleServiceImpl implements AuthRoleService {
 
     @Resource
     private AuthRoleDao authRoleDao;
-    @Resource
-    private BasicBussinessTypeRoleDao basicBussinessTypeRoleDao;
 
     @Override
     public List<AuthRole> listCustomerRoles(Integer page, Integer limit, Integer isCustomer) {

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

@@ -39,9 +39,8 @@ public class InvSpaceServiceImpl implements InvSpaceService {
         if (null == filterInvSpaceRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvSpaceRequest.getPage() && null != filterInvSpaceRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvSpaceRequest.getPage() - 1) * filterInvSpaceRequest.getLimit(), filterInvSpaceRequest.getLimit());
+        filterInvSpaceRequest.pageDispose();
-        }
         return invSpaceDao.filterList(filterInvSpaceRequest);
     }
 

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

@@ -81,7 +81,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
     public void deleteDictTypeByIds(Long[] dictIds) {
         for (Long dictId : dictIds) {
             SysDictType dictType = selectDictTypeById(dictId);
-
             SysDictDataRequest sysDictDataRequest = new SysDictDataRequest();
             sysDictDataRequest.setDictType(dictType.getDictType());
             SysDictData sysDictData = dictDataMapper.exists(sysDictDataRequest);
@@ -118,10 +117,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<SysDictData> updateDictType(SysDictType dict) {
-        SysDictType oldDict = baseMapper.selectById(dict.getDictId());
-//        dictDataMapper.updateByType(null, new LambdaUpdateWrapper<SysDictData>()
-//                .set(SysDictData::getDictType, dict.getDictType())
-//                .eq(SysDictData::getDictType, oldDict.getDictType()));
         int row = baseMapper.updateById(dict);
         if (row > 0) {
             SysDictDataRequest sysDictDataRequest = new SysDictDataRequest();
@@ -139,7 +134,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
      */
     @Override
     public String checkDictTypeUnique(SysDictType dict) {
-
         SysDictTypeRequest sysDictTypeRequest = new SysDictTypeRequest();
         sysDictTypeRequest.setDictType(dict.getDictType());
         SysDictType exist = baseMapper.exists(sysDictTypeRequest);

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

@@ -41,9 +41,8 @@ public class BasicBusTypeChangeServiceImpl extends ServiceImpl<BasicBusTypeChang
         if (null == filterBusTypeChangeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterBusTypeChangeRequest.getPage() && null != filterBusTypeChangeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterBusTypeChangeRequest.getPage() - 1) * filterBusTypeChangeRequest.getLimit(), filterBusTypeChangeRequest.getLimit());
+        filterBusTypeChangeRequest.pageDispose();
-        }
         return basicBusTypeChangeDao.filterList(filterBusTypeChangeRequest);
     }
 

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

@@ -32,9 +32,8 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
 
     @Override
     public List<BasicBusTypePreEntity> filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest) {
-        if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit());
+        busTypeChangeFilterRequest.pageDispose();
-        }
         return basicBusTypePreDao.filterList(busTypeChangeFilterRequest);
     }
 
@@ -70,9 +69,8 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
         if (null == filterBusTypePreRequest) {
             return Collections.emptyList();
         }
-        if (null != filterBusTypePreRequest.getPage() && null != filterBusTypePreRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterBusTypePreRequest.getPage() - 1) * filterBusTypePreRequest.getLimit(), filterBusTypePreRequest.getLimit());
+        filterBusTypePreRequest.pageDispose();
-        }
         return basicBusTypePreDao.selectBusTypePreResList(filterBusTypePreRequest);
     }
 

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

@@ -40,9 +40,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
         if (null == filterBussinessTypeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit());
+        filterBussinessTypeRequest.pageDispose();
-        }
         return basicBussinessTypeDao.filterList(filterBussinessTypeRequest);
     }
 
@@ -51,9 +50,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
         if (null == filterBussinessTypeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit());
+        filterBussinessTypeRequest.pageDispose();
-        }
         return basicBussinessTypeDao.filterJoinByUser(filterBussinessTypeRequest);
     }
 
@@ -169,9 +167,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
         if (null == filterBussinessTypeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit());
+        filterBussinessTypeRequest.pageDispose();
-        }
         return basicBussinessTypeDao.selectByUser(filterBussinessTypeRequest);
     }
 

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

@@ -105,9 +105,8 @@ public class IoCodeService extends ServiceImpl<IoCodeDao, IoCodeEntity> {
         if (null == filterCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
+        filterCodeRequest.pageDispose();
-        }
         return ioCodeDao.filterList(filterCodeRequest);
     }
 
@@ -116,9 +115,8 @@ public class IoCodeService extends ServiceImpl<IoCodeDao, IoCodeEntity> {
         if (null == filterCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
+        filterCodeRequest.pageDispose();
-        }
         return ioCodeDao.filterDrugList(filterCodeRequest);
     }
 

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

@@ -131,9 +131,8 @@ public class IoCodeTempService {
 
 
     public List<IoCodeTempResponse> findCodeList(FilterCodeRequest filterCodeRequest) {
-        if (null != filterCodeRequest && null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
+        filterCodeRequest.pageDispose();
-        }
         return ioCodeTempDao.selectCodeList(filterCodeRequest);
     }
 

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

@@ -149,9 +149,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         if (null == orderDetailBizRequest) {
             return Collections.emptyList();
         }
-        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        orderDetailBizRequest.pageDispose();
-        }
         return ioOrderDetailBizDao.filterList(orderDetailBizRequest);
     }
 
@@ -161,9 +160,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         if (null == orderDetailBizRequest) {
             return Collections.emptyList();
         }
-        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        orderDetailBizRequest.pageDispose();
-        }
         return ioOrderDetailBizDao.filterDrugList(orderDetailBizRequest);
     }
 
@@ -172,9 +170,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         if (null == OrderDetailCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
+        OrderDetailCodeRequest.pageDispose();
-        }
         return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest);
     }
 
@@ -232,9 +229,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         if (null == orderDetailBizRequest) {
             return Collections.emptyList();
         }
-        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        orderDetailBizRequest.pageDispose();
-        }
         return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest);
     }
     @Override

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

@@ -84,9 +84,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
         if (null == detailCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != detailCodeRequest.getPage() && null != detailCodeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailCodeRequest.getPage() - 1) * detailCodeRequest.getLimit(), detailCodeRequest.getLimit());
+        detailCodeRequest.pageDispose();
-        }
         return ioOrderDetailCodeDao.filterList(detailCodeRequest);
     }
 
@@ -95,9 +94,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
         if (null == detailCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != detailCodeRequest.getPage() && null != detailCodeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailCodeRequest.getPage() - 1) * detailCodeRequest.getLimit(), detailCodeRequest.getLimit());
+        detailCodeRequest.pageDispose();
-        }
         return ioOrderDetailCodeDao.filterDrugList(detailCodeRequest);
     }
 

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

@@ -57,9 +57,8 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         if (null == orderDetailResultRequest) {
             return Collections.emptyList();
         }
-        if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
+        orderDetailResultRequest.pageDispose();
-        }
         return orderDetailResultDao.filterList(orderDetailResultRequest);
     }
 
@@ -68,9 +67,8 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         if (null == orderDetailResultRequest) {
             return Collections.emptyList();
         }
-        if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
+        orderDetailResultRequest.pageDispose();
-        }
         return orderDetailResultDao.filterOrderList(orderDetailResultRequest);
     }
 

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

@@ -546,9 +546,8 @@ public class IoOrderServiceImpl implements IoOrderService {
         if (null == filterOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        filterOrderRequest.pageDispose();
-        }
         return orderDao.filterList(filterOrderRequest);
     }
 
@@ -557,9 +556,8 @@ public class IoOrderServiceImpl implements IoOrderService {
         if (null == filterOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        filterOrderRequest.pageDispose();
-        }
         return orderDao.getfilterOrderList(filterOrderRequest);
     }
 
@@ -568,9 +566,8 @@ public class IoOrderServiceImpl implements IoOrderService {
         if (null == filterOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        filterOrderRequest.pageDispose();
-        }
         return orderDao.filterOrderList(filterOrderRequest);
     }
 
@@ -825,9 +822,8 @@ public class IoOrderServiceImpl implements IoOrderService {
             }
         }
 
-        if (null != uploadOrderRequest.getPage() && null != uploadOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((uploadOrderRequest.getPage() - 1) * uploadOrderRequest.getLimit(), uploadOrderRequest.getLimit());
+        uploadOrderRequest.pageDispose();
-        }
         return orderDao.selectUploadOrder(uploadOrderRequest);
     }
 

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

@@ -33,9 +33,8 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService {
         if (null == filterReceiveDetailRequest) {
             return Collections.emptyList();
         }
-        if (null != filterReceiveDetailRequest.getPage() && null != filterReceiveDetailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterReceiveDetailRequest.getPage() - 1) * filterReceiveDetailRequest.getLimit(), filterReceiveDetailRequest.getLimit());
+        filterReceiveDetailRequest.pageDispose();
-        }
         return receiveDetailDao.filterList(filterReceiveDetailRequest);
     }
 

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

@@ -48,9 +48,8 @@ public class ReceiveServiceImpl implements ReceiveService {
         if (null == filterReceiveRequest) {
             return Collections.emptyList();
         }
-        if (null != filterReceiveRequest.getPage() && null != filterReceiveRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterReceiveRequest.getPage() - 1) * filterReceiveRequest.getLimit(), filterReceiveRequest.getLimit());
+        filterReceiveRequest.pageDispose();
-        }
         return receiveDao.filterList(filterReceiveRequest);
     }
 

src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java

@@ -40,9 +40,8 @@ public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMappe
         if (null == filterDeviceInspectTakeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterDeviceInspectTakeRequest.getPage() && null != filterDeviceInspectTakeRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterDeviceInspectTakeRequest.getPage() - 1) * filterDeviceInspectTakeRequest.getLimit(), filterDeviceInspectTakeRequest.getLimit());
+        filterDeviceInspectTakeRequest.pageDispose();
-        }
         return deviceInspectTaskMapper.filterList(filterDeviceInspectTakeRequest);
     }
 

src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java

@@ -30,9 +30,8 @@ public class DeviceProjectSetService extends ServiceImpl<DeviceProjectSetMapper,
         if (null == deviceProjectSetRequest) {
             return Collections.emptyList();
         }
-        if (null != deviceProjectSetRequest.getPage() && null != deviceProjectSetRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((deviceProjectSetRequest.getPage() - 1) * deviceProjectSetRequest.getLimit(), deviceProjectSetRequest.getLimit());
+        deviceProjectSetRequest.pageDispose();
-        }
         return deviceProjectSetMapper.filterList(deviceProjectSetRequest);
 
     }

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

@@ -35,9 +35,8 @@ public class DeviceMAOrderDetailServiceImpl implements DeviceMAOrderDetailServic
         if (null == detailRequest) {
             return Collections.emptyList();
         }
-        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        detailRequest.pageDispose();
-        }
         return deviceMAOrderDetailDao.filterList(detailRequest);
     }
 

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

@@ -50,9 +50,8 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService {
         if (null == filterDeviceMAOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != filterDeviceMAOrderRequest.getPage() && null != filterDeviceMAOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterDeviceMAOrderRequest.getPage() - 1) * filterDeviceMAOrderRequest.getLimit(), filterDeviceMAOrderRequest.getLimit());
+        filterDeviceMAOrderRequest.pageDispose();
-        }
         return deviceMAOrderDao.filterList(filterDeviceMAOrderRequest);
     }
 

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

@@ -45,9 +45,8 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
         if (null == detailRequest) {
             return Collections.emptyList();
         }
-        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        detailRequest.pageDispose();
-        }
         List<DeviceReceiveOrderDetailResponse> list = deviceReceiveOrderDetailDao.filterList(detailRequest);
         //设置是否可以自定义序列号标识
         list.forEach(item -> {
@@ -112,9 +111,8 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
         if (null == detailRequest) {
             return Collections.emptyList();
         }
-        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        detailRequest.pageDispose();
-        }
         return deviceReceiveOrderDetailDao.filterList(detailRequest);
     }
 

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

@@ -49,9 +49,8 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService
         if (null == deviceReceiveOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != deviceReceiveOrderRequest.getPage() && null != deviceReceiveOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((deviceReceiveOrderRequest.getPage() - 1) * deviceReceiveOrderRequest.getLimit(), deviceReceiveOrderRequest.getLimit());
+        deviceReceiveOrderRequest.pageDispose();
-        }
         return deviceReceiveOrderDao.filterList(deviceReceiveOrderRequest);
     }
 

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

@@ -41,9 +41,8 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
         if (null == codesRequest) {
             return Collections.emptyList();
         }
-        if (null != codesRequest.getPage() && null != codesRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((codesRequest.getPage() - 1) * codesRequest.getLimit(), codesRequest.getLimit());
+        codesRequest.pageDispose();
-        }
         return invCountCodesDao.filterList(codesRequest);
     }
 

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

@@ -38,9 +38,8 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
         if (null == detailRequest) {
             return Collections.emptyList();
         }
-        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        detailRequest.pageDispose();
-        }
         return invCountOrderDetailDao.filterList(detailRequest);
     }
 
@@ -49,9 +48,8 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
         if (null == detailRequest) {
             return Collections.emptyList();
         }
-        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        detailRequest.pageDispose();
-        }
         return invCountOrderDetailDao.filterCountDetail(detailRequest);
     }
 

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

@@ -92,9 +92,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         if (null == filterInvCountOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvCountOrderRequest.getPage() && null != filterInvCountOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvCountOrderRequest.getPage() - 1) * filterInvCountOrderRequest.getLimit(), filterInvCountOrderRequest.getLimit());
+        filterInvCountOrderRequest.pageDispose();
-        }
         return invCountOrderDao.filterList(filterInvCountOrderRequest);
     }
 

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

@@ -47,9 +47,8 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
         if (null == filterInvMAOrderDetailRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvMAOrderDetailRequest.getPage() && null != filterInvMAOrderDetailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvMAOrderDetailRequest.getPage() - 1) * filterInvMAOrderDetailRequest.getLimit(), filterInvMAOrderDetailRequest.getLimit());
+        filterInvMAOrderDetailRequest.pageDispose();
-        }
         return invMAOrderDetailDao.filterList(filterInvMAOrderDetailRequest);
     }
 

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

@@ -46,9 +46,8 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
         if (null == filterInvMAOrderRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvMAOrderRequest.getPage() && null != filterInvMAOrderRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvMAOrderRequest.getPage() - 1) * filterInvMAOrderRequest.getLimit(), filterInvMAOrderRequest.getLimit());
+        filterInvMAOrderRequest.pageDispose();
-        }
         return invMAOrderDao.filterList(filterInvMAOrderRequest);
     }
 

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

@@ -41,9 +41,8 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         if (null == filterInvPlaceRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvPlaceRequest.getPage() && null != filterInvPlaceRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvPlaceRequest.getPage() - 1) * filterInvPlaceRequest.getLimit(), filterInvPlaceRequest.getLimit());
+        filterInvPlaceRequest.pageDispose();
-        }
         return invProductNewDao.selectPlaceDetailList(filterInvPlaceRequest);
     }
 

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

@@ -109,9 +109,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         if (null == invPreProductDetailRequest) {
             return Collections.emptyList();
         }
-        if (null != invPreProductDetailRequest.getPage() && null != invPreProductDetailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((invPreProductDetailRequest.getPage() - 1) * invPreProductDetailRequest.getLimit(), invPreProductDetailRequest.getLimit());
+        invPreProductDetailRequest.pageDispose();
-        }
         return invPreInProductDetailDao.filterPreProductDetailList(invPreProductDetailRequest);
     }
 

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

@@ -109,9 +109,8 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
         if (null == invPreProductDetailRequest) {
             return Collections.emptyList();
         }
-        if (null != invPreProductDetailRequest.getPage() && null != invPreProductDetailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((invPreProductDetailRequest.getPage() - 1) * invPreProductDetailRequest.getLimit(), invPreProductDetailRequest.getLimit());
+        invPreProductDetailRequest.pageDispose();
-        }
         return invPreProductDetailDao.filterPreProductDetailList(invPreProductDetailRequest);
     }
 

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

@@ -54,9 +54,8 @@ public class InvPreProductServiceImpl implements InvPreProductService {
         if (null == invPreProductRequest) {
             return Collections.emptyList();
         }
-        if (null != invPreProductRequest.getPage()) {
+        // 分页处理
-            PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
+        invPreProductRequest.pageDispose();
-        }
         return invPreProductDao.filterList(invPreProductRequest);
     }
 

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

@@ -29,9 +29,8 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService {
         if (null == filterInvPreinDetailRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvPreinDetailRequest.getPage() && null != filterInvPreinDetailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvPreinDetailRequest.getPage() - 1) * filterInvPreinDetailRequest.getLimit(), filterInvPreinDetailRequest.getLimit());
+        filterInvPreinDetailRequest.pageDispose();
-        }
         return invPreinDetailDao.filterList(filterInvPreinDetailRequest);
     }
 

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

@@ -25,9 +25,8 @@ public class InvPreinOrderServiceImpl implements InvPreinOrderService {
         if (null == filterInvPreinRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvPreinRequest.getPage() && null != filterInvPreinRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvPreinRequest.getPage() - 1) * filterInvPreinRequest.getLimit(), filterInvPreinRequest.getLimit());
+        filterInvPreinRequest.pageDispose();
-        }
         return invPreinOrderDao.filterList(filterInvPreinRequest);
     }
 

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

@@ -53,9 +53,8 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
         if (null == invPreProductRequest) {
             return Collections.emptyList();
         }
-        if (null != invPreProductRequest.getPage()) {
+        // 分页处理
-            PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
+        invPreProductRequest.pageDispose();
-        }
         return invPreinProductDao.filterList(invPreProductRequest);
     }
 

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

@@ -63,9 +63,8 @@ public class InvProductServiceImpl implements InvProductService {
         if (null == filterInvProductRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        filterInvProductRequest.pageDispose();
-        }
         return invProductDao.filterProductList(filterInvProductRequest);
     }
 
@@ -75,9 +74,8 @@ public class InvProductServiceImpl implements InvProductService {
         if (null == filterInvProductRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        filterInvProductRequest.pageDispose();
-        }
         return invProductDao.filterList(filterInvProductRequest);
     }
 
@@ -96,9 +94,8 @@ public class InvProductServiceImpl implements InvProductService {
         if (null == filterInvProductRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        filterInvProductRequest.pageDispose();
-        }
         return invProductDao.stockStatistics(filterInvProductRequest);
     }
 
@@ -107,9 +104,8 @@ public class InvProductServiceImpl implements InvProductService {
         if (null == filterInvProductRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        filterInvProductRequest.pageDispose();
-        }
         return invProductDao.getMAInvProducts(filterInvProductRequest);
     }
 
@@ -118,9 +114,8 @@ public class InvProductServiceImpl implements InvProductService {
         if (null == filterInvProductRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        filterInvProductRequest.pageDispose();
-        }
         return invProductDao.getCountInvProduct(filterInvProductRequest);
     }
 
@@ -129,9 +124,8 @@ public class InvProductServiceImpl implements InvProductService {
         if (null == filterInvProductRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        filterInvProductRequest.pageDispose();
-        }
         return invProductDao.filterProductNames(filterInvProductRequest);
     }
 

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

@@ -81,9 +81,8 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
         if (null == filterInvProductDetailRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvProductDetailRequest.getPage() && null != filterInvProductDetailRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvProductDetailRequest.getPage() - 1) * filterInvProductDetailRequest.getLimit(), filterInvProductDetailRequest.getLimit());
+        filterInvProductDetailRequest.pageDispose();
-        }
         return invProductNewDao.filterInvProductDetailList(filterInvProductDetailRequest);
     }
 

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

@@ -46,9 +46,8 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService {
         if (null == filterInvRemindMsgRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvRemindMsgRequest.getPage() && null != filterInvRemindMsgRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvRemindMsgRequest.getPage() - 1) * filterInvRemindMsgRequest.getLimit(), filterInvRemindMsgRequest.getLimit());
+        filterInvRemindMsgRequest.pageDispose();
-        }
         return invRemindMsgDao.filterList(filterInvRemindMsgRequest);
     }
 

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

@@ -49,9 +49,8 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
         if (null == filterInvRemindSetRequest) {
             return Collections.emptyList();
         }
-        if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit());
+        filterInvRemindSetRequest.pageDispose();
-        }
         List<InvRemindSetResponse> list = invRemindSetDao.filterList(filterInvRemindSetRequest);
         if (CollUtil.isNotEmpty(list)) {
             list.forEach(invRemindSetResponse -> {

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

@@ -60,9 +60,8 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
         if (null == filterCertRemindMsgRequest || null == filterCertRemindMsgRequest.getType()) {
             return Collections.emptyList();
         }
-        if (null != filterCertRemindMsgRequest.getPage() && null != filterCertRemindMsgRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterCertRemindMsgRequest.getPage() - 1) * filterCertRemindMsgRequest.getLimit(), filterCertRemindMsgRequest.getLimit());
+        filterCertRemindMsgRequest.pageDispose();
-        }
 
         //根据类型查询预警信息
         switch (filterCertRemindMsgRequest.getType()) {

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

@@ -25,9 +25,8 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao, SupCompany
         if (companyRequest == null) {
             return Collections.emptyList();
         }
-        if (null != companyRequest.getPage() && null != companyRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((companyRequest.getPage() - 1) * companyRequest.getLimit(), companyRequest.getLimit());
+        companyRequest.pageDispose();
-        }
         List<SupCompanyEntity> companyEntities = supCompanyDao.filterCompany(companyRequest);
         if (CollUtil.isNotEmpty(companyEntities)) {
             for (SupCompanyEntity companyEntity : companyEntities) {

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

@@ -39,9 +39,8 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl<ThrBusTypeOriginDao
 
     @Override
     public List<ThrBusTypeOriginEntity> filterEnableList(FilterThrBusTypeOriginRequest filterThrBusTypeOriginRequest) {
-        if (null != filterThrBusTypeOriginRequest.getPage() && null != filterThrBusTypeOriginRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterThrBusTypeOriginRequest.getPage() - 1) * filterThrBusTypeOriginRequest.getLimit(), filterThrBusTypeOriginRequest.getLimit());
+        filterThrBusTypeOriginRequest.pageDispose();
-        }
         return thrBusTypeOriginDao.filterEnableList(filterThrBusTypeOriginRequest);
     }
 
@@ -50,9 +49,8 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl<ThrBusTypeOriginDao
         if (null == filterThrBusTypeOriginRequest) {
             return Collections.emptyList();
         }
-        if (null != filterThrBusTypeOriginRequest.getPage() && null != filterThrBusTypeOriginRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((filterThrBusTypeOriginRequest.getPage() - 1) * filterThrBusTypeOriginRequest.getLimit(), filterThrBusTypeOriginRequest.getLimit());
+        filterThrBusTypeOriginRequest.pageDispose();
-        }
         return thrBusTypeOriginDao.filterJoinList(filterThrBusTypeOriginRequest);
     }
 

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

@@ -26,9 +26,8 @@ public class ThrOrderUploadLogServiceImpl implements ThrOrderUploadLogService {
         if (null == uploadLogRequest) {
             return Collections.emptyList();
         }
-        if (null != uploadLogRequest && null != uploadLogRequest.getLimit()) {
+        // 分页处理
-            PageHelper.offsetPage((uploadLogRequest.getPage() - 1) * uploadLogRequest.getLimit(), uploadLogRequest.getLimit());
+        uploadLogRequest.pageDispose();
-        }
         return uploadLogDao.filterList(uploadLogRequest);
     }