Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java

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