付款管理、订单管理：列表接口处理数据范围长度判断，0返回空

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

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

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

@@ -69,12 +69,15 @@ public class HlwPaymentApiController extends JeecgController<HlwPayment, IHlwPay
         for (int i = 0; i < jsonArray.size(); i++) {
             companyCodeList.add(jsonArray.get(i).toString());
         }
-        HlwPayment hlwPayment = new HlwPayment();
-        hlwPayment.setPaymentCode(paymentCode);
-        hlwPayment.setCompanyName(companyName);
-        hlwPayment.setStatus(status);
-        Page<HlwPayment> page = new Page<HlwPayment>(pageNo, pageSize);
-        Page<HlwPayment> pageList = hlwPaymentService.paymentList(page, companyCodeList, hlwPayment, applicationId);
+        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);
+        }
         return Result.ok(pageList);
     }
 
@@ -116,7 +119,7 @@ public class HlwPaymentApiController extends JeecgController<HlwPayment, IHlwPay
         Integer paymentId = jsonObject.getInteger("paymentId");
         Integer status = jsonObject.getInteger("status");
         Integer applicationId = jsonObject.getInteger("applicationId");
-        String  userCode=jsonObject.getString("userCode");
+        String userCode = jsonObject.getString("userCode");
         HlwPaymentDetail hlwPaymentDetail = new HlwPaymentDetail();
         hlwPaymentDetail.setPaymentId(paymentId);
         hlwPaymentDetail.setStatus(status);
@@ -124,7 +127,7 @@ public class HlwPaymentApiController extends JeecgController<HlwPayment, IHlwPay
             List<HlwPaymentDetail> list = hlwPaymentDetailService.paymentDetailListNoPage(hlwPaymentDetail);
             return Result.ok(list);
         } else {
-            if(StringUtils.isNotBlank(userCode)){
+            if (StringUtils.isNotBlank(userCode)) {
                 hlwPaymentDetail.setUserCode(userCode);
                 hlwPaymentDetail.setApplicationId(applicationId);
             }
@@ -163,9 +166,10 @@ public class HlwPaymentApiController extends JeecgController<HlwPayment, IHlwPay
     @PostMapping(value = "/paymentDetail")
     public Result<?> paymentDetail(@RequestBody JSONObject jsonObject) {
         //获取请求参数
-        Integer paymentDetailId = jsonObject.getInteger("paymentDetailId");;
+        Integer paymentDetailId = jsonObject.getInteger("paymentDetailId");
+        ;
         HlwPaymentDetail hlwPaymentDetail = hlwPaymentDetailService.getById(paymentDetailId);
-        HlwOrder hlwOrder=hlwOrderService.getById(hlwPaymentDetail.getOrderId());
+        HlwOrder hlwOrder = hlwOrderService.getById(hlwPaymentDetail.getOrderId());
         hlwPaymentDetail.setOrderNumber(hlwOrder.getOrderCode());
         return Result.ok(hlwPaymentDetail);
     }