订单查询部门和人员是可以关联查询，查询时可以选择多个部门或者是多个人的订单同时查询

crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -202,11 +202,13 @@ public class NewFrontApi {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "status", value = "订单状态（-1：全部，0：待支付，1：待发货,2：部分发货， 3：待核销，4：待收货,5：已收货,6：已完成，9：已取消）", required = true),
             @ApiImplicitParam(name = "department"),
-            @ApiImplicitParam(name = "name")
+            @ApiImplicitParam(name = "name"),
+            @ApiImplicitParam(name = "isRemit")
     })
     public CommonResult<CommonPage<OrderFrontDataResponse2>> orderList(@RequestParam(name = "status") Integer status,
                                                                        @RequestParam(name = "department") String department,
                                                                        @RequestParam(name = "name") String name,
+                                                                       @RequestParam(name = "isRemit") Integer isRemit,
                                                                        @PathVariable String id,
                                                                        @ModelAttribute PageParamRequest pageRequest) {
         LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();
@@ -226,7 +228,7 @@ public class NewFrontApi {
                 .map( UserBypassAccount::getUserId )
                 .collect( Collectors.toList() );
 
-        return CommonResult.success( CommonPage.restPage( frontOrderService.list2( status, pageRequest, ids,
+        return CommonResult.success( CommonPage.restPage( frontOrderService.list2(isRemit,status, pageRequest, ids,
                 Integer.valueOf( id ),department
                 , name ) ) );
     }

crmeb-front/src/main/java/com/zbkj/front/service/FrontOrderService.java

@@ -59,7 +59,7 @@ public interface FrontOrderService {
      */
     PageInfo<OrderFrontDataResponse> list(Integer status, PageParamRequest pageRequest);
 
-    PageInfo<OrderFrontDataResponse2> list2(Integer status, PageParamRequest pageRequest,List<Integer> ids,Integer id,
+    PageInfo<OrderFrontDataResponse2> list2(Integer isRemit,Integer status, PageParamRequest pageRequest,List<Integer> ids,Integer id,
                                             String department, String name);
 
     PageInfo<OrderFrontDataResponse2> list3(Integer status, PageParamRequest pageRequest,List<Integer> ids,

crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -994,7 +994,7 @@ public class FrontOrderServiceImpl implements FrontOrderService {
     }
 
     @Override
-    public PageInfo<OrderFrontDataResponse2> list2(Integer status, PageParamRequest pageRequest, List<Integer> ids,
+    public PageInfo<OrderFrontDataResponse2> list2(Integer isRemit,Integer status, PageParamRequest pageRequest, List<Integer> ids,
                                                    Integer id,
                                                    String department, String name) {
         Integer userId = userService.getUserIdException();
@@ -1014,7 +1014,7 @@ public class FrontOrderServiceImpl implements FrontOrderService {
             }
         }
 
-        PageInfo<Order> pageInfo = orderService.getUserOrderList2( userId, status, pageRequest, ids ,id);
+        PageInfo<Order> pageInfo = orderService.getUserOrderList2(  isRemit,userId, status, pageRequest, ids ,id);
         List<Order> orderList = pageInfo.getList();
         if (CollUtil.isEmpty( orderList )) {
             return CommonPage.copyPageInfo( pageInfo, CollUtil.newArrayList() );

crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java

@@ -48,7 +48,7 @@ public interface OrderService extends IService<Order> {
      */
     PageInfo<Order> getUserOrderList(Integer userId, Integer status, PageParamRequest pageRequest);
 
-    PageInfo<Order> getUserOrderList2(Integer userId, Integer status, PageParamRequest pageRequest,
+    PageInfo<Order> getUserOrderList2(Integer isRemit,Integer userId, Integer status, PageParamRequest pageRequest,
                                       List<Integer> ids,Integer id);
 
     PageInfo<Order> getUserOrderList3(Integer userId, Integer status, PageParamRequest pageRequest,
@@ -275,4 +275,4 @@ public interface OrderService extends IService<Order> {
     Integer getProductNumCount(Integer uid, Integer proId, Integer productType);
 
     List<Integer> getOrderUid();
-}
+}

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -173,7 +173,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         return CommonPage.copyPageInfo(page, orderList);
     }
 
-    public PageInfo<Order> getUserOrderList2(Integer userId, Integer status, PageParamRequest pageRequest,
+    public PageInfo<Order> getUserOrderList2(Integer isRemit,Integer userId, Integer status, PageParamRequest pageRequest,
                                              List<Integer> ids,Integer id) {
         Page<Order> page = PageHelper.startPage(pageRequest.getPage(), pageRequest.getLimit());
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
@@ -181,6 +181,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
         lqw.and(i -> i.eq(Order::getQyId, id).or().isNull(Order::getQyId));
         lqw.in(Order::getUid, ids);
+        if (1==isRemit){
+            lqw.eq(Order::getIsRemit, isRemit);
+        }
+        if (null==isRemit||2==isRemit){
+            lqw.notIn(Order::getIsRemit, 1);
+        }
+
+
         if (status >= 0) {
             if (status == 1) {
                 lqw.in(Order::getStatus, OrderConstants.ORDER_STATUS_WAIT_SHIPPING, OrderConstants.ORDER_STATUS_PART_SHIPPING);