Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !98

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/ScheduleServiceImpl.java

@@ -58,6 +58,12 @@ public class ScheduleServiceImpl implements ScheduleService {
 			List<OrderRequest> orders = this.queryOrderRequests(t.getTeamId(), date);
 			item.setOrder(this.getTeamOrderSum(orders));
 
+			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
+			if(orders == null || orders.isEmpty()){
+				item.setChildren(children);
+				continue;
+			}
+
 			// 获取team技术员列表
 			List<OrgTeamEngineer> teamEngineers = this.queryOrgTeamEngineers(t.getTeamId());
 
@@ -66,7 +72,6 @@ public class ScheduleServiceImpl implements ScheduleService {
 			List<OrderAppointment> orderAppointments = this.queryOrderAppointments(orderRequestIds, date);
 			Map<String, List<OrderAppointment>> engineerOrders = orderAppointments.stream().collect(Collectors.groupingBy(OrderAppointment::getEngineerCode));
 
-			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
 			for (Map.Entry<String, List<OrderAppointment>> entry : engineerOrders.entrySet()) {
 				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();