付款管理、订单管理：列表接口处理数据范围长度判断，还原

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwOrderApiController.java

@@ -188,25 +188,14 @@ public class HlwOrderApiController extends JeecgController<HlwOrder, IHlwOrderSe
         hlwOrder.setCompanyName(companyName);
         hlwOrder.setCreateTime_begin(createTime_begin);
         hlwOrder.setCreateTime_end(createTime_end);
-        if (companyCodeList.size() > 0) {
-            //不分页
-            if (pageSize == -1) {
-                List<HlwOrder> list = hlwOrderService.queryOrderListNoPage(companyCodeList, hlwOrder, applicationId);
-                return Result.ok(list);
-            } else {
-                Page<HlwOrder> page = new Page<HlwOrder>(pageNo, pageSize);
-                Page<HlwOrder> pageList = hlwOrderService.queryOrderList(page, companyCodeList, hlwOrder, applicationId);
-                return Result.ok(pageList);
-            }
+        //不分页
+        if (pageSize == -1) {
+            List<HlwOrder> list = hlwOrderService.queryOrderListNoPage(companyCodeList, hlwOrder, applicationId);
+            return Result.ok(list);
         } else {
-            //不分页
-            if (pageSize == -1) {
-                List<HlwOrder> list = new ArrayList<>();
-                return Result.ok(list);
-            } else {
-                Page<HlwOrder> pageList = new Page<>();
-                return Result.ok(pageList);
-            }
+            Page<HlwOrder> page = new Page<HlwOrder>(pageNo, pageSize);
+            Page<HlwOrder> pageList = hlwOrderService.queryOrderList(page, companyCodeList, hlwOrder, applicationId);
+            return Result.ok(pageList);
         }
     }
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwPaymentApiController.java

@@ -70,14 +70,12 @@ public class HlwPaymentApiController extends JeecgController<HlwPayment, IHlwPay
             companyCodeList.add(jsonArray.get(i).toString());
         }
         Page<HlwPayment> pageList = new Page<>();
-        if (companyCodeList.size() > 0) {
-            HlwPayment hlwPayment = new HlwPayment();
-            hlwPayment.setPaymentCode(paymentCode);
-            hlwPayment.setCompanyName(companyName);
-            hlwPayment.setStatus(status);
-            Page<HlwPayment> page = new Page<HlwPayment>(pageNo, pageSize);
-            pageList = hlwPaymentService.paymentList(page, companyCodeList, hlwPayment, applicationId);
-        }
+        HlwPayment hlwPayment = new HlwPayment();
+        hlwPayment.setPaymentCode(paymentCode);
+        hlwPayment.setCompanyName(companyName);
+        hlwPayment.setStatus(status);
+        Page<HlwPayment> page = new Page<HlwPayment>(pageNo, pageSize);
+        pageList = hlwPaymentService.paymentList(page, companyCodeList, hlwPayment, applicationId);
         return Result.ok(pageList);
     }