|
|
@@ -104,6 +104,10 @@ class Good extends Base
|
|
|
if($brand_id!==""){
|
|
|
$where[]=['a.brand_id',"=",$brand_id];
|
|
|
}
|
|
|
+ $is_compliance = isset($this->post['is_compliance']) && $this->post['is_compliance'] !=="" ? intval($this->post['is_compliance']) :"";
|
|
|
+ if($is_compliance!==""){
|
|
|
+ $where[]=['b.is_compliance',"=",$is_compliance];
|
|
|
+ }
|
|
|
// $role=$this->checkRole();
|
|
|
// if(!empty($role['write']) ){
|
|
|
// $where[]=["a.createrid","in",$role['write']];
|
|
|
@@ -134,7 +138,10 @@ class Good extends Base
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
$list = Db::name('good')
|
|
|
->alias("a")
|
|
|
- ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.supplierName,a.good_unit,a.noble_metal,a.companyNo,a.companyName,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,a.is_stock,p.platform_name")
|
|
|
+ ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,
|
|
|
+ a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.supplierName,
|
|
|
+ a.good_unit,a.noble_metal,a.companyNo,a.companyName,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,
|
|
|
+ b.exam_status,a.createrid purchase_id,a.creater purchase,a.is_stock,p.platform_name,b.is_compliance,b.compliance_remark")
|
|
|
//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
|
|
|
->leftJoin("good_platform b","a.spuCode=b.spuCode")
|
|
|
// ->leftJoin("supplier s","a.supplierNo=s.code")
|
