Переглянути джерело

红点查找增加为空判断

hejq 7 роки тому
батько
коміт
f71c1cea87

+ 8 - 4
src/main/java/com/uas/platform/b2b/service/impl/OrderRedDotServiceImpl.java

@@ -120,8 +120,10 @@ public class OrderRedDotServiceImpl implements OrderRedDotService {
         List<OrderRedDotAll> redDotAllList = redDotAllDao.findAll(idList);
         List<OrderRedDotDone> redDotDoneList = new ArrayList<>();
         redDotAllList.forEach(redDotAll -> {
-            OrderRedDotDone redDotDone = new OrderRedDotDone(redDotAll);
-            redDotDoneList.add(redDotDone);
+            if (null != redDotAll) {
+                OrderRedDotDone redDotDone = new OrderRedDotDone(redDotAll);
+                redDotDoneList.add(redDotDone);
+            }
         });
         if (!CollectionUtil.isEmpty(redDotDoneList)) {
             redDotDoneDao.save(redDotDoneList);
@@ -141,8 +143,10 @@ public class OrderRedDotServiceImpl implements OrderRedDotService {
             Integer count = countByOrderTypeAndOrderId(orderType, id);
             if (count == 0) {
                 OrderRedDotAll redDotAll = redDotAllDao.findByOrderTypeAndOrderId(orderType, id);
-                OrderRedDotDone redDotDone = new OrderRedDotDone(redDotAll);
-                redDotDoneList.add(redDotDone);
+                if (null != redDotAll) {
+                    OrderRedDotDone redDotDone = new OrderRedDotDone(redDotAll);
+                    redDotDoneList.add(redDotDone);
+                }
             }
         });
         if (!CollectionUtil.isEmpty(redDotDoneList)) {