ZxcZxc123 2 年之前
父节点
当前提交
97245d866d
共有 2 个文件被更改,包括 11 次插入21 次删除
  1. 5 10
      app/model/api/GroupModel.php
  2. 6 11
      app/system/controller/GroupController.php

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

@@ -113,18 +113,13 @@ class GroupModel extends Model
 
 
 
 
     /**
     /**
-     * 删除分组
-     *
-     * @param int $id 分组ID
-     * @return bool
+     * 删除分组信息
+     * @param int $grId
+     * @return mixed
      */
      */
-    public function deleteGroup($id)
+    public function deleteGroups($grId)
     {
     {
-        $result = $this->where('id', $id)->delete();
-        if ($result > 0) {
-            return true;
-        }
-        return false;
+        return $this->where('gr_id', $grId)->delete();
     }
     }
 
 
 }
 }

+ 6 - 11
app/system/controller/GroupController.php

@@ -159,26 +159,21 @@ class GroupController extends BaseController
 
 
 
 
     /**
     /**
-     * 删除分组
-     *
+     * 删除分组信息
      * @param Request $request
      * @param Request $request
-     * @return mixed|\think\response\Json
+     * @return mixed
      */
      */
     public function delete(Request $request)
     public function delete(Request $request)
     {
     {
-        $id = $request->param('id/d', 0);
-        if (!$id) {
-            return json(['code' => -1, 'msg' => '参数错误']);
-        }
+        $grId = Request::param('gr_id');
 
 
         $groupModel = new GroupModel();
         $groupModel = new GroupModel();
-        $result = $groupModel->where('gr_id', $id)->delete();
+        $result = $groupModel->deleteGroups($grId);
 
 
-        if ($result) {
+        if ($result !== false) {
             return json(['code' => 0, 'msg' => '删除成功']);
             return json(['code' => 0, 'msg' => '删除成功']);
-        } else {
-            return json(['code' => -1, 'msg' => '删除失败']);
         }
         }
+        return json(['code' => 1, 'msg' => '删除失败']);
     }
     }