diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/OrderController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/OrderController.java index 30e379d..61c2af0 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/OrderController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/OrderController.java @@ -27,10 +27,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -198,9 +195,12 @@ public class OrderController extends JeecgController { .eq(OrderOperator::getOrderId, order.getId()) ); List userIds = orderOperators.stream().map(OrderOperator::getUserId).collect(Collectors.toList()); - List emergencyProfessionUsers = emergencyProfessionUserMapper.selectList(new LambdaQueryWrapper() - .in(EmergencyProfessionUser::getUserId, userIds) - ); + List emergencyProfessionUsers = new ArrayList<>(); + if (!userIds.isEmpty()) { + emergencyProfessionUsers = emergencyProfessionUserMapper.selectList(new LambdaQueryWrapper() + .in(EmergencyProfessionUser::getUserId, userIds) + ); + } OrderDetail detail = orderDetailService.getById(order.getId()); order.setOrderDetail(detail);