ZxcZxc123 2 лет назад
Родитель
Сommit
dfac0461ed
2 измененных файлов с 20 добавлено и 75 удалено
  1. 10 10
      app/model/api/GroupModel.php
  2. 10 65
      app/system/controller/GroupController.php

+ 10 - 10
app/model/api/GroupModel.php

@@ -101,20 +101,20 @@ class GroupModel extends Model
 
 
 
-
-
     /**
-     * 编辑分组
-     *
+     * 更新编辑分组信息
      * @param int $id 分组ID
-     * @param array $data 分组数据
-     * @return bool
+     * @param array $data 更新数据
+     * @return bool 更新成功返回 true,否则返回 false
      */
-    public function edit($id, $data)
+    public function updateGroups($id, $data)
     {
-        $result = $this->where('gr_id', $id)->update($data);
-
-        return $result !== false;
+        try {
+            $this->where('gr_id', $id)->save($data);
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
     }
 
 

+ 10 - 65
app/system/controller/GroupController.php

@@ -4,8 +4,6 @@ namespace app\system\controller;
 use app\BaseController;
 use app\model\api\GroupModel;
 use think\facade\Request;
-use think\route\dispatch\Controller;
-use think\facade\View;
 use think\model;
 
 
@@ -68,81 +66,28 @@ class GroupController extends BaseController
 
 
 
-
     /**
-     * 编辑分组
-     *
-     * @param int $gr_id 分组ID
+     * 编辑分组信息
+     * @param Request $request
      * @return mixed
      */
-    public function edit($gr_id)
+    public function edit(Request $request)
     {
-        if (!$gr_id) {
-            return json(['code' => -1, 'msg' => '参数错误']);
-        }
+        $data = $request->only(['gr_id', 'uname', 'type1', 'type2', 'title', 'ins', 'indeximg']);
+        $data['create_time'] = time();
 
-        $groupModel = new GroupModel();
-        $group = $groupModel->find($gr_id);
-        if (!$group) {
-            return json(['code' => -1, 'msg' => '分组不存在']);
-        }
-
-        if ($this->request->isPost()) {
-            $data = [
-                'uname' => $group['uname'],
-                'audit' => $group['audit'],
-            ];
 
-            $result = $groupModel->edit($gr_id, $data);
+        $groupModel = new GroupModel();
+        $result = $groupModel->updateGroups($data['gr_id'], $data);
 
-            if ($result) {
-                return json(['code' => 0, 'msg' => '保存成功']);
-            } else {
-                return json(['code' => -1, 'msg' => '保存失败']);
-            }
+        if ($result !== false) {
+            return json(['code' => 0, 'msg' => '保存成功']);
         }
-
-        return json(['code' => 0, 'data' => $group]);
+        return json(['code' => 1, 'msg' => '保存失败']);
     }
 
 
 
-
-
-
-//    /**
-//     * 修改审核状态
-//     *
-//     * @return mixed|\think\response\Json
-//     */
-//    public function changeStatus()
-//    {
-//        $id = Request::param('gr_id', 0, '');
-//        if (!$id) {
-//            return app('json')->fail('参数错误');
-//        }
-//
-//        $groupModel = new GroupModel();
-//        $group = $groupModel->find($id);
-//        if (!$group) {
-//            return app('json')->fail('分组不存在');
-//        }
-//
-//        $status = Request::param('audit', 0, '');
-//        $data = [
-//            'audit' => $status,
-//        ];
-//
-//        $result = $groupModel->where('gr_id', $id)->update($data);
-//
-//        if ($result) {
-//            return app('json')->success('保存成功');
-//        } else {
-//            return app('json')->fail('保存失败');
-//        }
-//    }
-
-
     /**
      * 修改审核状态
      * @return mixed