Merge remote-tracking branch 'origin/master'

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

@@ -65,6 +65,13 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
 
     @Override
     public List<ThrInvWarehouseEntity> selectByThrDeptCode(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
+        if (filterThrSubInvWarehouseRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrSubInvWarehouseRequest.getPage() != null) {
+            int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit());
+        }
         return thrInvWarehouseDao.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
     }