【应急就医】详情报错修复
This commit is contained in:
+7
-7
@@ -27,10 +27,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -198,9 +195,12 @@ public class OrderController extends JeecgController<Order, IOrderService> {
|
|||||||
.eq(OrderOperator::getOrderId, order.getId())
|
.eq(OrderOperator::getOrderId, order.getId())
|
||||||
);
|
);
|
||||||
List<String> userIds = orderOperators.stream().map(OrderOperator::getUserId).collect(Collectors.toList());
|
List<String> userIds = orderOperators.stream().map(OrderOperator::getUserId).collect(Collectors.toList());
|
||||||
List<EmergencyProfessionUser> emergencyProfessionUsers = emergencyProfessionUserMapper.selectList(new LambdaQueryWrapper<EmergencyProfessionUser>()
|
List<EmergencyProfessionUser> emergencyProfessionUsers = new ArrayList<>();
|
||||||
.in(EmergencyProfessionUser::getUserId, userIds)
|
if (!userIds.isEmpty()) {
|
||||||
);
|
emergencyProfessionUsers = emergencyProfessionUserMapper.selectList(new LambdaQueryWrapper<EmergencyProfessionUser>()
|
||||||
|
.in(EmergencyProfessionUser::getUserId, userIds)
|
||||||
|
);
|
||||||
|
}
|
||||||
OrderDetail detail = orderDetailService.getById(order.getId());
|
OrderDetail detail = orderDetailService.getById(order.getId());
|
||||||
order.setOrderDetail(detail);
|
order.setOrderDetail(detail);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user