|
@@ -339,7 +339,7 @@ class ProductInventoryService extends Service
|
|
}
|
|
}
|
|
|
|
|
|
//系统设置列表
|
|
//系统设置列表
|
|
- public function productInventorySetList2($data, $user){
|
|
|
|
|
|
+ public function productInventorySetList1($data, $user){
|
|
$model = new ProductInventorySet(['userData' => $user, 'search' => $data]);
|
|
$model = new ProductInventorySet(['userData' => $user, 'search' => $data]);
|
|
$model = $model->where('del_time',0)
|
|
$model = $model->where('del_time',0)
|
|
->select('id','top_depart_id','param_one','param_two')
|
|
->select('id','top_depart_id','param_one','param_two')
|
|
@@ -357,7 +357,6 @@ class ProductInventoryService extends Service
|
|
public function productInventorySetList($data, $user){
|
|
public function productInventorySetList($data, $user){
|
|
$model = new ProductInventorySet();
|
|
$model = new ProductInventorySet();
|
|
$model = $model->where('del_time',0)
|
|
$model = $model->where('del_time',0)
|
|
- ->where('param_one','>',0)
|
|
|
|
->select('id','top_depart_id','param_one','param_two');
|
|
->select('id','top_depart_id','param_one','param_two');
|
|
|
|
|
|
if(empty($data['top_depart_id'])){
|
|
if(empty($data['top_depart_id'])){
|