111

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -107,14 +107,17 @@ public class StoreServiceImpl implements StoreService {
             ordNos = Arrays.asList(ordNo.split(","));
         }
 
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
-                customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1,fkcustmerName);
 
-        if(page != -1){
+
+        if(page != -1 && rows != -1){
             PageHelper.startPage(page, rows);
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
+                    customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1,fkcustmerName);
             PageInfo<Store> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         }else {
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
+                    customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1,fkcustmerName);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }