From 5e1cf8e0e94b42a94c3a3d3ccda5147fe6ce94f0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 09:42:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
index fe34127..9b29460 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
@@ -35,13 +35,15 @@
         for (TCoupon tCoupon : list) {
             couponIds.append(tCoupon.getId()).append(",");
         }
-        if (StringUtils.hasLength(couponIds)){
-            // 去除最后一个字符
-            couponIds.deleteCharAt(couponIds.length()-1);
-        }
-        List<Integer> data = appCouponClient.getCountByCouponIds(couponIds.toString()).getData();
-        for (int i = 0; i < list.size(); i++) {
-            list.get(i).setCount(data.get(i));
+        if (!list.isEmpty()){
+            if (StringUtils.hasLength(couponIds)){
+                // 去除最后一个字符
+                couponIds.deleteCharAt(couponIds.length()-1);
+            }
+            List<Integer> data = appCouponClient.getCountByCouponIds(couponIds.toString()).getData();
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setCount(data.get(i));
+            }
         }
         pageInfo.setRecords(list);
         return pageInfo;

--
Gitblit v1.7.1