发货申请管理，列表添加申请人所属部门的筛选条件

app/admin/controller/Sale.php

@@ -3032,11 +3032,15 @@ class Sale extends Base
 //        if(!empty($role['platform']) ){
 //            $where[]=["b.platform_id","in",$role['platform']];
 //        }
+        $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
+        if ($company_name !== "") $where[] = ["a.apply_id", 'in', get_company_item_user_by_name($company_name)];
+
         $count = Db::name('order_out')
             ->alias('a')
             ->join("sale b", "b.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=b.customer_code", "left")
             ->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
+            ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("order_send os","os.outCode=a.outCode")
             ->where($where)
             ->where($condition)
@@ -3049,13 +3053,13 @@ class Sale extends Base
             ->join("customer_info v", "v.companyNo=b.customer_code", "left")
             ->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
             ->leftJoin("order_send os","os.outCode=a.outCode")
-            ->field("a.*,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo")
+            ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
+            ->field("a.*,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,u.itemid")
             ->where($where)
             ->where($condition)
             ->order("addtime desc")
             ->page($page, $size)
-            ->select()
-            ->toArray();
+            ->cursor();
         $data=[];
         foreach ($list as $value) {
             $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
@@ -3074,6 +3078,8 @@ class Sale extends Base
             $value['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
             $value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
             $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
+            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);