From 178ae29cf4c7144a6dfc12b8c47a0e6acded767b Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 13 九月 2023 15:11:07 +0800
Subject: [PATCH] 采样
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..5546370 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
@@ -95,7 +95,6 @@
List<Map<String, Object>> extracted = extracted(arrayList, list,pageNum,pageSize);
return AjaxResult.success(extracted);
}
-
if(null !=name){
wq.like(TjSampling::getCusName,name);
List<TjSampling> list = tjSamplingService.list(wq);
@@ -110,7 +109,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 +120,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);
}
@@ -131,6 +135,9 @@
for (Map.Entry<String, List<TjSampling>> entry : stringListMap.entrySet()) {
Map<String,Object>map=new HashMap<>();
TjCustomer customer = customerService.getById(entry.getKey());
+ if (customer==null){
+ continue;
+ }
customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
--
Gitblit v1.8.0