Commit c760d2fe authored by hj's avatar hj

更新提交

parent 4c937d5c
...@@ -35,6 +35,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd ...@@ -35,6 +35,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd
}else{ }else{
$productsModel->whereIn('products.p_code',$pCode); $productsModel->whereIn('products.p_code',$pCode);
} }
$productsModel->where('chemicals.c_status', 1);
$product = $productsModel->get(); $product = $productsModel->get();
if($product){ if($product){
return $product->toArray(); return $product->toArray();
...@@ -128,6 +129,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd ...@@ -128,6 +129,7 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd
public function getProductsByCas($cas) public function getProductsByCas($cas)
{ {
$productsModel = $this->join('chemicals', 'chemicals.c_id','products.c_id')->join('raw', 'raw.r_id','products.r_id'); $productsModel = $this->join('chemicals', 'chemicals.c_id','products.c_id')->join('raw', 'raw.r_id','products.r_id');
$productsModel->where('chemicals.c_status', 1);
$product = $productsModel->where('chemicals.c_cas',$cas)->get(); $product = $productsModel->where('chemicals.c_cas',$cas)->get();
if($product){ if($product){
return $product->toArray(); return $product->toArray();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment