ad

app/admin/controller/Good.php

@@ -118,7 +118,7 @@ class Good extends Base
         $count = Db::name('good')
             ->alias("a")
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
-            ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")
+            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
             ->leftJoin("platform p","p.id=b.platform_code")
             ->where('p.platform_type',0)//只筛选非对接平台的商品
             ->where($where)
@@ -133,7 +133,7 @@ class Good extends Base
             //成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
 //            ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
-            ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")
+            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
             ->leftJoin("platform p","p.id=b.platform_code")
             ->where('p.platform_type',0)//只筛选非对接平台的商品
             ->where($where)
@@ -311,6 +311,8 @@ class Good extends Base
         $data['exam_status']=$good_platform['exam_status'];
         $data['is_online']=$good_platform['is_online'];
         $data['plat_code']=$good_platform['plat_code'];
+        $data['createrid']=$good_platform['createrid']??'';
+        $data['creater']=$good_platform['creater']??'';
         $data['exclusive']=makeExcluse($data['is_exclusive']);
         $unit =Db::name("unit")->where(["id"=>$data['good_unit']])->find();
         $data['unit'] = isset($unit['unit'])?$unit['unit']:'';

app/admin/controller/Sale.php

@@ -4096,6 +4096,8 @@ class Sale extends Base
         }
         $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
         $order['supplier_name'] = isset($supplier['name']) ? $supplier['name'] : "";
+        $order['cgder'] = isset($supplier['person']) ? $supplier['person'] : "";
+        $order['cgderid'] = isset($supplier['personid']) ? $supplier['personid'] : "";
         $palt = Db::name("platform")->where(["id" => $order['platform_id']])->find();
         $order['platform_name'] = isset($palt['platform_name']) ? $palt['platform_name'] : "";
         $company = Db::name("business")->where(["companyNo" => $order['companyNo']])->find();