1. 解决订单无法获取列表问题

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -48,6 +48,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.ydtech.modules.order.constants.OrderCacheConstant.*;
@@ -180,9 +181,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public BasePageResult<InsOrders> queryOrders(OrderQueryVo orderQueryVo) {
+        String deptId = "";
         if ("admin".equals(orderQueryVo.getUserId())) {
             orderQueryVo.setUserId("");
         }
+
         PageMethod.startPage(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
         List<InsOrders> order = baseMapper.getOrder(orderQueryVo);
 
@@ -194,7 +197,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         List<String> collect = pageInfo.getList().stream().map(InsOrders::getOrderno).collect(Collectors.toList());
         // 2. 查询订单信息包括的子订单信息
         LambdaQueryWrapper<InsAreaCompany> queryWrapper = new LambdaQueryWrapper<InsAreaCompany>()
-                .in(InsAreaCompany::getInsOrderNo, collect)
+                .in(InsAreaCompany::getOrderno, collect)
                 .eq(StringUtils.isNotEmpty(orderQueryVo.getOrderStatus()), InsAreaCompany::getOrderstatus, orderQueryVo.getOrderStatus());
 
         List<InsAreaCompany> insAreaCompanies = insAreaCompanyService.getBaseMapper()