Merge branch 'feature_OrderServiceList_wangl' into 'develop'

修改

See merge request !10

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

@@ -7,15 +7,12 @@ import com.alibaba.cloud.integration.order.dao.OrderAppointmentDao;
 import com.alibaba.cloud.integration.order.dao.OrderRequestDao;
 import com.alibaba.cloud.integration.order.dto.OrderServiceList;
 import com.alibaba.cloud.integration.order.dto.OrderServiceListResp;
-import com.alibaba.cloud.integration.order.entity.Order;
 import com.alibaba.cloud.integration.order.entity.OrderAppointment;
 import com.alibaba.cloud.integration.order.entity.OrderRequest;
-import com.alibaba.cloud.integration.order.entity.OrderTimeline;
 import com.alibaba.cloud.integration.order.service.OrderServiceListService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.antlr.v4.runtime.atn.SemanticContext;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +66,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		List<OrderServiceList> content = new ArrayList<>();
 		for (OrderRequest o: records) {
 			OrderServiceList record = new OrderServiceList();
-			names = engineerNames.get(o.getOrderId());
+			names = engineerNames.getOrDefault(o.getOrderId(), null);
 			record.setOrderId(o.getOrderId());
 			record.setType(o.getType());
 			record.setBrand(o.getBrand());