修改装备使用统计报表

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -817,7 +817,12 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             BeanPlusUtil.copyProperties(orderDetail,orderDetailDto);
             String detailJson = orderDetail.getDetailJson();
             List<DetailJsonReq> detailJsonReqs = JSONObject.parseArray(detailJson, DetailJsonReq.class);
-            orderDetailDto.setChildJson(detailJsonReqs);
+            if (CollectionUtil.isEmpty(detailJsonReqs)|| ObjectUtil.isNull(detailJsonReqs)){
+                orderDetailDto.setChildJson(new ArrayList<>());
+            }else {
+
+                orderDetailDto.setChildJson(detailJsonReqs);
+            }
             orderDetailDtoList.add(orderDetailDto);
         }