Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -184,24 +184,26 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         vo = checkAppStatusInfo(vo);
 
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
-        for (KylinTicketTimesVo partner : ticketTimesList) {
-            List<KylinTicketVo> ticketList = partner.getTicketList();
-            List<KylinTicketVo> ticketListNew = new ArrayList<>();
-            for (KylinTicketVo ticket : ticketList) {
-                int status = checkTicketStatus(ticket);
-                ticket.setStatus(status);
-                // 会员状态
-                Integer isMemberStatus = getIsMemberStatus(ticket);
-                ticket.setIsMemberStatus(isMemberStatus);
-                if (null != isAgent && isAgent > 0) {
-                    if (ticket.getIsAgent() == isAgent) {
+        if (null != ticketTimesList) {
+            for (KylinTicketTimesVo partner : ticketTimesList) {
+                List<KylinTicketVo> ticketList = partner.getTicketList();
+                List<KylinTicketVo> ticketListNew = new ArrayList<>();
+                for (KylinTicketVo ticket : ticketList) {
+                    int status = checkTicketStatus(ticket);
+                    ticket.setStatus(status);
+                    // 会员状态
+                    Integer isMemberStatus = getIsMemberStatus(ticket);
+                    ticket.setIsMemberStatus(isMemberStatus);
+                    if (null != isAgent && isAgent > 0) {
+                        if (ticket.getIsAgent() == isAgent) {
+                            ticketListNew.add(ticket);
+                        }
+                    } else {
                         ticketListNew.add(ticket);
                     }
-                } else {
-                    ticketListNew.add(ticket);
                 }
+                partner.setTicketList(ticketListNew);
             }
-            partner.setTicketList(ticketListNew);
         }
 
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);