Merge branch 'master' of https://github.com/yanwenwu/catch-admin

catch/permissions/controller/Role.php

@@ -96,7 +96,7 @@ class Role extends CatchController
         
         // 更新department
         $hasDepartmentIds = $role->getDepartments()->column('id');
-        $departmentIds = $request->param('departments');
+        $departmentIds = $request->param('departments',[]);
 
         // 已存在部门 IDS
         $existedDepartmentIds = [];

catch/system/controller/OperateLog.php

@@ -1,9 +1,9 @@
 <?php
+
 namespace catchAdmin\system\controller;
 
 use catcher\base\CatchController;
 use catcher\CatchResponse;
-use think\facade\Db;
 use catchAdmin\system\model\OperateLog as Log;
 
 class OperateLog extends CatchController
@@ -31,4 +31,22 @@ class OperateLog extends CatchController
     {
         return CatchResponse::success($log->where('id', '>', 0)->delete(), '清空成功');
     }
+
+    /**
+     * 批量删除
+     * 
+     * @param mixed $id 
+     * @throws \Exception
+     * @return \think\response\Json
+     */
+    public function delete($id, Log $log)
+    {
+        $ids = explode(',', $id);
+
+        if (empty($ids)) {
+            return false;
+        }
+
+        return CatchResponse::success($log->whereIn('id', $ids)->delete());
+    }
 }

catch/system/model/OperateLog.php

@@ -1,25 +1,29 @@
 <?php
+
 namespace catchAdmin\system\model;
 
 use catchAdmin\permissions\model\Users;
 use catcher\traits\db\BaseOptionsTrait;
+use catchAdmin\system\model\search\OperateLogSearch;
 
 class OperateLog extends \think\Model
 {
     use BaseOptionsTrait;
+    use OperateLogSearch;
+
 
     protected $name = 'operate_log';
-    
+
     protected $field = [
         'id', // 
-		'module', // 模块名称
+        'module', // 模块名称
-		'operate', // 操作模块
+        'operate', // 操作模块
-		'route', // 路由
+        'route', // 路由
-		'params', // 参数
+        'params', // 参数
-		'ip', // ip
+        'ip', // ip
-		'creator_id', // 创建人ID
+        'creator_id', // 创建人ID
-		'method', // 请求方法
+        'method', // 请求方法
-		'created_at', // 登录时间   
+        'created_at', // 登录时间   
     ];
 
     /**
@@ -33,8 +37,9 @@ class OperateLog extends \think\Model
     public function getList()
     {
         return $this->field([$this->aliasField('*')])
-                    ->catchJoin(Users::class, 'id', 'creator_id', ['username as creator'])
+            ->catchJoin(Users::class, 'id', 'creator_id', ['username as creator'])
-                    ->order($this->aliasField('id'), 'desc')
+            ->catchSearch()
-                    ->paginate();
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
     }
-}
+}

catch/system/model/search/OperateLogSearch.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace catchAdmin\system\model\search;
+
+trait OperateLogSearch
+{
+    public function searchModuleAttr($query, $value, $data)
+    {
+        return $query->whereLike('module', $value);
+    }
+
+    public function searchMethodAttr($query, $value, $data)
+    {
+        return $query->whereLike('method', $value);
+    }
+
+    public function searchCreatorAttr($query, $value, $data)
+    {
+        return $query->where('username', $value);
+    }
+
+    public function searchCreateAtAttr($query, $value, $data)
+    {
+        return $query->whereTime($this->aliasField('created_at'), 'between', $value);
+    }
+}

catch/system/route.php

@@ -1,11 +1,12 @@
 <?php
-$router->group(function () use ($router){
+$router->group(function () use ($router) {
     // 登录日志
     $router->get('log/login', '\catchAdmin\system\controller\LoginLog@list');
     $router->delete('loginLog/empty', '\catchAdmin\system\controller\LoginLog@empty');
     // 操作日志
     $router->get('log/operate', '\catchAdmin\system\controller\OperateLog@list');
     $router->delete('operateLog/empty', '\catchAdmin\system\controller\OperateLog@empty');
+    $router->delete('operateLog/delete', '\catchAdmin\system\controller\OperateLog@delete');
 
     // 数据字典
     $router->get('tables', '\catchAdmin\system\controller\DataDictionary@tables');
@@ -35,4 +36,4 @@ $router->group(function () use ($router){
 //developer路由
 $router->resource('developer', '\catchAdmin\system\controller\Developer')->middleware('auth');
 // 开发者认证
-$router->post('developer/authenticate', '\catchAdmin\system\controller\Developer@authenticate');
+$router->post('developer/authenticate', '\catchAdmin\system\controller\Developer@authenticate');