用户组(全部)优化

app/admin/controller/DataGroup.php

@@ -266,7 +266,7 @@ class DataGroup extends Base
     //用户组列表（全部）
     public function getDataGroupListAll()
     {
-        $param = $this->request->filter('trim')->only(['status' => '', 'title' => '', 'nickname' => '', 'type' => '']);
+//        $param = $this->request->filter('trim')->only(['status' => '', 'title' => '', 'type' => '']);
 
         $db = new DataGroupModel();
 
@@ -277,24 +277,25 @@ class DataGroup extends Base
 //            ->group('a.id')
             ->where('a.is_del', DataGroupModel::$delete_正常);
 
-        $val = Validate::rule([
-            'status|状态' => 'number|in:' . DataGroupModel::$status_启用 . ',' . DataGroupModel::$status_禁用,
-            'title|用户组名称' => 'max:100',
-            'nickname|成员名称' => 'max:100',
-            'type|共享类型' => 'number|in:' . DataGroupModel::$type_可编辑 . ',' . DataGroupModel::$type_只读 . ',' . DataGroupModel::$type_不共享,
-        ]);
+//        $val = Validate::rule([
+//            'status|状态' => 'number|in:' . DataGroupModel::$status_启用 . ',' . DataGroupModel::$status_禁用,
+//            'title|用户组名称' => 'max:100',
+////            'nickname|成员名称' => 'max:100',
+//            'type|共享类型' => 'number|in:' . DataGroupModel::$type_可编辑 . ',' . DataGroupModel::$type_只读 . ',' . DataGroupModel::$type_不共享,
+//        ]);
 
-        if (!$val->check($param)) return error_show(1005, $val->getError());
+//        if (!$val->check($param)) return error_show(1005, $val->getError());
 
-        if ($param['status'] != '') $rs->where('a.status', $param['status']);
-        if ($param['title'] != '') $rs->whereLike('a.title', '%' . $param['title'] . '%');
-        if ($param['nickname'] != '') $rs->whereLike('u.nickname', '%' . $param['nickname'] . '%');
-        if ($param['type'] != '') $rs->where('a.type', $param['type']);
+//        if ($param['status'] != '') $rs->where('a.status', $param['status']);
+//        if ($param['title'] != '') $rs->whereLike('a.title', '%' . $param['title'] . '%');
+//        if ($param['nickname'] != '') $rs->whereLike('u.nickname', '%' . $param['nickname'] . '%');
+//        if ($param['type'] != '') $rs->where('a.type', $param['type']);
 
-        $list = $rs
+        $list = $db
+            ->where('is_del', DataGroupModel::$delete_正常)
 //            ->field('a.*,GROUP_CONCAT(u.nickname) nickname')
-            ->field('a.id,a.title')
-            ->order('a.id', 'desc')
+            ->field('id,title,status')
+            ->order('id', 'desc')
             ->select()
             ->toArray();