企业商品加类型筛选

app/admin/controller/CompanyGood.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 use app\admin\logic\CompanyGoodLogic;
 use app\BaseController;
 use app\model\CommonModel;
+use app\model\GoodModel;
 use think\exception\ValidateException;
 use think\facade\Config;
 use think\facade\Validate;
@@ -15,7 +16,7 @@ class CompanyGood extends BaseController
     //列表
     public function list()
     {
-        $param = $this->request->only(['group_id' => '', 'page' => 1, 'size' => 10, 'good_name' => '', 'good_code' => '', 'status' => ''], 'post');
+        $param = $this->request->only(['group_id' => '', 'page' => 1, 'size' => 10, 'good_name' => '', 'good_code' => '', 'status' => '', 'type' => ''], 'post');
 
         $val = Validate::rule([
             'group_id|分组id' => 'number|gt:0',
@@ -24,6 +25,7 @@ class CompanyGood extends BaseController
             'good_name|商品名称' => 'number|elt:100',
             'good_cood|商品编码' => 'number|elt:100',
             'status|状态' => 'number|in:' . CommonModel::$status_normal . ',' . CommonModel::$status_disable,
+            'type|商品类型' => 'number|in:' . GoodModel::$type_shopping . ',' . GoodModel::$type_exchange
         ]);
 
         if (!$val->check($param)) throw new ValidateException($val->getError());

app/admin/logic/CompanyGoodLogic.php

@@ -30,6 +30,7 @@ class CompanyGoodLogic extends BaseLogic
         if ($data['good_name'] != '') $db->whereLike('b.good_name', '%' . $data['good_name'] . '%');
         if ($data['good_code'] != '') $db->whereLike('b.good_code', '%' . $data['good_code'] . '%');
         if ($data['status'] != '') $db->where('a.status', $data['status']);
+        if ($data['type'] != '') $db->where('a.type', $data['type']);
 
         $count = $db->count('a.id');
 

app/admin/logic/ThemeLogic.php

@@ -268,7 +268,7 @@ class ThemeLogic extends BaseLogic
                 'img|图片' => 'require|max:255',
                 'jump_type|跳转类型' => 'require|number|in:' . ThemeModel::$jump_type_external . ',' . ThemeModel::$jump_type_inside . ',' . ThemeModel::$jump_type_no,
                 'jump_param|跳转参数' => 'max:255',
-                'good_id|商品id' => 'number|gt:0',
+                'good_id|商品id' => 'number|egt:0',
             ]);
             foreach ($data['modular'] as $modular) {