抽象scope trait

catch/system/model/SensitiveWord.php

@@ -40,21 +40,4 @@ class SensitiveWord extends CatchModel
     {
         return $query->whereLike('word', $value);
     }
-
-
-    /**
-     * 创建人
-     *
-     * @time 2020年06月17日
-     * @param $query
-     * @return mixed
-     */
-    public function scopeCreator($query)
-    {
-        return $query->addSelectSub(function (){
-            $user = app(Users::class);
-            return $user->whereColumn($this->getTable() . '.creator_id', $user->getTable() . '.id')
-                ->field('username');
-        }, 'creator');
-    }
 }

extend/catcher/base/CatchModel.php

@@ -5,6 +5,7 @@ use catcher\CatchQuery;
 use catcher\traits\db\BaseOptionsTrait;
 use catcher\traits\db\TransTrait;
 use think\model\concern\SoftDelete;
+use catcher\traits\db\ScopeTrait;
 
 /**
  *
@@ -14,7 +15,7 @@ use think\model\concern\SoftDelete;
  */
 abstract class CatchModel extends \think\Model
 {
-    use SoftDelete, TransTrait, BaseOptionsTrait;
+    use SoftDelete, TransTrait, BaseOptionsTrait, ScopeTrait;
 
     protected $createTime = 'created_at';
 

extend/catcher/traits/db/BaseOptionsTrait.php

@@ -2,8 +2,6 @@
 
 namespace catcher\traits\db;
 
-use catchAdmin\permissions\model\Users;
-
 trait BaseOptionsTrait
 {
     /**

extend/catcher/traits/db/ScopeTrait.php

@@ -1,10 +1,36 @@
 <?php
 /**
- * @filename  scopeTrait.php
+ * @filename  ScopeTrait.php
  * @createdAt 2020/6/21
  * @project  https://github.com/yanwenwu/catch-admin
  * @document http://doc.catchadmin.com
  * @author   JaguarJack <njphper@gmail.com>
  * @copyright By CatchAdmin
  * @license  https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt
- */
+ */
+namespace catcher\traits\db;
+
+use catchAdmin\permissions\model\Users;
+
+trait ScopeTrait
+{
+    /**
+     * 创建人
+     *
+     * @time 2020年06月17日
+     * @param $query
+     * @return mixed
+     */
+    public function scopeCreator($query)
+    {
+        if (in_array('creator_id', $this->field)) {
+            return $query->addSelectSub(function () {
+                $user = app(Users::class);
+                return $user->whereColumn($this->getTable() . '.creator_id', $user->getTable() . '.id')
+                    ->field('username');
+            }, 'creator');
+        }
+
+        return $query;
+    }
+}