likang

catch/fan/model/Fan.php

@@ -3,15 +3,14 @@
 namespace catchAdmin\fan\model;
 
 use catcher\base\CatchModel as Model;
-use catcher\traits\db\BaseOptionsTrait;
-use catcher\traits\db\ScopeTrait;
 use think\facade\Db;
+use catchAdmin\permissions\model\DataRangScopeTrait;
 use catchAdmin\fan\model\get\FanGet;
 use catchAdmin\fan\model\search\FanSearch;
 
 class Fan extends Model
 {
-    use BaseOptionsTrait, ScopeTrait;
+    use DataRangScopeTrait;
     use FanGet;
     use FanSearch;
     // 表名
@@ -50,7 +49,8 @@ class Fan extends Model
     );
     public function getList()
     {
-        return $this->catchSearch()
+        return $this->dataRange()
+        ->catchSearch()
         ->append(['wind_name'])
         ->field('*')
         ->catchOrder()

catch/flange/model/Flange.php

@@ -3,13 +3,12 @@
 namespace catchAdmin\flange\model;
 
 use catcher\base\CatchModel as Model;
-use catcher\traits\db\BaseOptionsTrait;
-use catcher\traits\db\ScopeTrait;
+use catchAdmin\permissions\model\DataRangScopeTrait;
 use think\facade\Db;
 
 class Flange extends Model
 {
-    use BaseOptionsTrait, ScopeTrait;
+    use DataRangScopeTrait;
     // 表名
     public $name = 'flange';
     // 数据库字段映射
@@ -68,7 +67,8 @@ class Flange extends Model
     );
     public function getList()
     {
-        return $this->catchSearch()
+        return $this ->dataRange()
+        ->catchSearch()
         ->append(['depart_name','model_type','wind_name','fan_number'])
         ->field('*')
         ->catchOrder()