From 25945cec9a4d25ad09d7ccb73b1c42c11aa3e8a4 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期三, 22 三月 2023 16:57:21 +0800
Subject: [PATCH] 2222

---
 src/main/java/com/example/jz/service/impl/CauseServiceImpl.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
index 4c87b5d..2a0731c 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -166,17 +166,29 @@
 
         List<Integer> list = reports.stream()
                 .map(item -> item.getCauseId())
-                .distinct()
                 .filter(integer -> integer != null)
+                .distinct()
                 .collect(Collectors.toList());
-        List<Cause> causes = causeDao.selectList(new LambdaQueryWrapper<Cause>().notIn(Cause::getId, list));
-        List<NewCauseVo> res = causes.stream()
-                .map(item -> {
-                    NewCauseVo newCauseVo = new NewCauseVo();
-                    newCauseVo.setName(item.getName());
-                    newCauseVo.setId(item.getId());
-                    return newCauseVo;
-                }).collect(Collectors.toList());
+        List<NewCauseVo> res;
+        if (!Objects.isNull(list) && list.size()!= 0){
+            List<Cause> causes = causeDao.selectList(new LambdaQueryWrapper<Cause>().notIn(Cause::getId, list));
+            res = causes.stream()
+                    .map(item -> {
+                        NewCauseVo newCauseVo = new NewCauseVo();
+                        newCauseVo.setName(item.getName());
+                        newCauseVo.setId(item.getId());
+                        return newCauseVo;
+                    }).collect(Collectors.toList());
+        }else {
+            List<Cause> causes = causeDao.selectList(null);
+            res = causes.stream()
+                    .map(item -> {
+                        NewCauseVo newCauseVo = new NewCauseVo();
+                        newCauseVo.setName(item.getName());
+                        newCauseVo.setId(item.getId());
+                        return newCauseVo;
+                    }).collect(Collectors.toList());
+        }
         return res;
     }
 

--
Gitblit v1.8.0