18792927508 2 yıl önce
ebeveyn
işleme
a54280c347

+ 4
- 0
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java Dosyayı Görüntüle

@@ -1,6 +1,7 @@
1 1
 package com.ruoyi.common.core.controller;
2 2
 
3 3
 import java.beans.PropertyEditorSupport;
4
+import java.util.ArrayList;
4 5
 import java.util.Date;
5 6
 import java.util.List;
6 7
 import org.slf4j.Logger;
@@ -82,6 +83,9 @@ public class BaseController
82 83
     @SuppressWarnings({ "rawtypes", "unchecked" })
83 84
     protected TableDataInfo getDataTable(List<?> list)
84 85
     {
86
+        if(list == null){
87
+            list=new ArrayList<>();
88
+        }
85 89
         TableDataInfo rspData = new TableDataInfo();
86 90
         rspData.setCode(HttpStatus.SUCCESS);
87 91
         rspData.setMsg("查询成功");

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java Dosyayı Görüntüle

@@ -63,7 +63,7 @@ public class ShortMessageServiceImpl implements ShortMessageService {
63 63
     public List<SmsSendRecord> smsSendRecordList(SmsSendRecord smsSendRecord) {
64 64
         List<SmsSendRecord> records = smsRecordMapper.getSmsSendRecord(smsSendRecord);
65 65
         if (CollectionUtil.isEmpty(records)) {
66
-            return null;
66
+            return records;
67 67
         }
68 68
         List<Long> templateIds = records.stream().map(SmsSendRecord::getMsSmsTemplateId).collect(Collectors.toList());
69 69
         if (CollectionUtil.isEmpty(templateIds)) {