cqpCow 1 年之前
父节点
当前提交
b4ec239cbd
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 1 1
      app/Model/ProductInventorySet.php
  2. 1 2
      app/Service/ProductInventoryService.php

+ 1 - 1
app/Model/ProductInventorySet.php

@@ -9,7 +9,7 @@ class ProductInventorySet extends Model
 {
 //    protected $fillable = ['userData','search'];
     protected $guarded = [];
-    protected $table = "product_inventory_set"; //指定表
+    protected $table = "depart_set"; //指定表
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';

+ 1 - 2
app/Service/ProductInventoryService.php

@@ -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 = $model->where('del_time',0)
             ->select('id','top_depart_id','param_one','param_two')
@@ -357,7 +357,6 @@ class ProductInventoryService extends Service
     public function productInventorySetList($data, $user){
         $model = new ProductInventorySet();
         $model = $model->where('del_time',0)
-            ->where('param_one','>',0)
             ->select('id','top_depart_id','param_one','param_two');
 
         if(empty($data['top_depart_id'])){