111

app/system/controller/GroupController.php

@@ -14,23 +14,21 @@ class GroupController extends BaseController
 {
 
     /**
-     * 获取分组列表
-     * @return string
-     * @throws \think\db\exception\DbException
+     * 分组列表
+     *
+     * @return mixed
      */
     public function index()
     {
-        $params = input('get.');
-
-        $title = isset($params['title']) ? $params['title'] : '';
-        $page = isset($params['page']) ? intval($params['page']) : 1;
-        $pagesize = isset($params['pagesize']) ? intval($params['pagesize']) : 10;
+        $title = Request::param('title');
+        $page = Request::param('page', 1, 'intval');
+        $pagesize = Request::param('pagesize', 10, 'intval');
 
         $groupModel = new GroupModel();
         $query = $groupModel->order('gr_id ASC');
 
         if (!empty($title)) {
-            $query->whereLike('title', '%' . $title . '%');
+            $query->whereLike('gr_name', '%' . $title . '%');
         }
 
         $list = $query->paginate([
@@ -81,13 +79,13 @@ class GroupController extends BaseController
     public function edit($id)
     {
         if (!$id) {
-            return ['code' => -1, 'msg' => '参数错误'];
+            return json(['code' => -1, 'msg' => '参数错误']);
         }
 
         $groupModel = new GroupModel();
         $group = $groupModel->find($id);
         if (!$group) {
-            return ['code' => -1, 'msg' => '分组不存在'];
+            return json(['code' => -1, 'msg' => '分组不存在']);
         }
 
         if ($this->request->isPost()) {
@@ -95,7 +93,7 @@ class GroupController extends BaseController
             $status = $this->request->post('status/d', 0);
 
             if (!$name) {
-                return ['code' => -1, 'msg' => '分组名称不能为空'];
+                return json(['code' => -1, 'msg' => '分组名称不能为空']);
             }
 
             $data = [
@@ -106,13 +104,13 @@ class GroupController extends BaseController
             $result = $groupModel->edit($id, $data);
 
             if ($result) {
-                return ['code' => 0, 'msg' => '保存成功'];
+                return json(['code' => 0, 'msg' => '保存成功']);
             } else {
-                return ['code' => -1, 'msg' => '保存失败'];
+                return json(['code' => -1, 'msg' => '保存失败']);
             }
         }
 
-        return View::fetch('edit', ['group' => $group]);
+        return json(['code' => 0, 'data' => $group]);
     }