From 8621fd09be0d89653391f2570d0878e4b3a9f0b5 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 13 九月 2023 11:58:38 +0800
Subject: [PATCH] zjh 2023/09/13---2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 5d388a6..7efbf8f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -110,7 +110,7 @@
cacheMapValue = redisCache.getCacheMapValue("sampling", "wqs");
}
asyncService.saveSampling();
- List<Map<String,Object>> collect =null;
+ List<Map<String,Object>> collect =new ArrayList<>();
Map<String,Object>map=new HashMap<>();
if(null ==cacheMapValue || cacheMapValue.size()==0){
wq.eq(TjSampling::getIsSignFor,isSignFor);
@@ -121,7 +121,12 @@
collect = cacheMapValue.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
map.put("total",cacheMapValue.size());
}
- map.put("list",collect);
+ if (collect!=null){
+ map.put("list",collect);
+ }else {
+ map.put("list",new ArrayList<Map<String,Object>>());
+ }
+
return AjaxResult.success(map);
}
--
Gitblit v1.8.0