diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
index 4b72ff48..340c8cdf 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
@@ -38,6 +38,10 @@ public class ComplexQueryController extends BaseController {
     @GetMapping("/getRetainedEquipmentList")
     public AjaxResult getRetainedEquipmentList(RetainedEquipmentInfo bean) {
         bean.setIsExport(1);
+        if (bean.getIsApp() != null && bean.getIsApp() == 1) {
+            List<RetainedEquipmentInfo> pageList = complexQueryService.getRetainedEquipmentList(bean);
+            return AjaxResult.success(pageList);
+        }
         startPage();
         List<RetainedEquipmentInfo> pageList = complexQueryService.getRetainedEquipmentList(bean);
         return AjaxResult.success(getDataTable(pageList));
@@ -93,9 +97,10 @@ public class ComplexQueryController extends BaseController {
     @ApiOperation(value = "综合查询--查询在库机具设备详情")
     @GetMapping("/getStorageInfoList")
     public AjaxResult getStorageInfoList(StorageInfo bean) {
-        startPage();
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<StorageInfo> list = complexQueryService.getMaCodeList(bean);
-        return AjaxResult.success(getDataTable(list));
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**