1

app/JsonRpc/WebsiteService.php

@@ -1186,48 +1186,45 @@ class WebsiteService implements WebsiteServiceInterface
         if (isset($data['website_id']) && !empty($data['website_id'])) {
             array_push($where, ['website_category.website_id', '=', $data['website_id']]);
         }
-        if (isset($data['name']) && !empty($data['name'])) {
-            array_push($where, ['website_category.name', 'like', '%' . $data['name'] . '%']);
-        }
-        if (isset($data['alias']) && !empty($data['alias'])) {
-            array_push($where, ['website_category.alias', 'like', '%' . $data['alias'] . '%']);
-        }
-        if (isset($data['department_id']) && !empty($data['department_id'])) {
-            array_push($where, ['category.department_id', '=', $data['department_id']]);
-        }
-        if (isset($data['city_id']) && !empty($data['city_id'])) {
-            array_push($where, ['category.city_id', '=', $data['city_id']]);
-        }
+//        if (isset($data['name']) && !empty($data['name'])) {
+//            array_push($where, ['website_category.name', 'like', '%' . $data['name'] . '%']);
+//        }
+//        if (isset($data['alias']) && !empty($data['alias'])) {
+//            array_push($where, ['website_category.alias', 'like', '%' . $data['alias'] . '%']);
+//        }
+//        if (isset($data['department_id']) && !empty($data['department_id'])) {
+//            array_push($where, ['category.department_id', '=', $data['department_id']]);
+//        }
+//        if (isset($data['city_id']) && !empty($data['city_id'])) {
+//            array_push($where, ['category.city_id', '=', $data['city_id']]);
+//        }
         $result = WebsiteCategory::where($where)
-            ->leftJoin("category", 'website_category.category_id', 'category.id')
-            ->leftJoin("department", 'category.department_id', 'department.id')
-            ->leftJoin("district", 'category.city_id', 'district.id')
-            ->select("website_category.*", "department.name as department_name", "district.name as city_name")
-            ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])
+//            ->leftJoin("category", 'website_category.category_id', 'category.id')
+//            ->leftJoin("department", 'category.department_id', 'department.id')
+//            ->leftJoin("district", 'category.city_id', 'district.id')
+//            ->select("website_category.*", "department.name as department_name", "district.name as city_name")
+//            ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])
+            ->orderBy("sort","asc")
             ->get();
 
-        $count = WebsiteCategory::where($where)
-            ->leftJoin("category", 'website_category.category_id', 'category.id')
-            ->leftJoin("department", 'category.department_id', 'department.id')
-            ->leftJoin("district", 'category.city_id', 'district.id')
-            ->count();
+//        $count = WebsiteCategory::where($where)
+//            ->leftJoin("category", 'website_category.category_id', 'category.id')
+//            ->leftJoin("department", 'category.department_id', 'department.id')
+//            ->leftJoin("district", 'category.city_id', 'district.id')
+//            ->count();
         if (empty($result)) {
             return Result::error("没有数据", 0);
         }
-        $data = [
-            'rows' => $result->toArray(),
-            'count' => $count,
-        ];
-        if ($result) {
-            return Result::success($data);
-        } else {
-            return Result::error("查询失败", 0);
-        }
+//        $data = [
+//            'rows' => $result->toArray(),
+//            'count' => $count,
+//        ];
         if ($result) {
-            return Result::success($result);
+            return Result::success( $result->toArray());
         } else {
             return Result::error("查询失败", 0);
         }
+
     }
 
     /**