wesmiler пре 3 месеци
родитељ
комит
4d60a18156
1 измењених фајлова са 10 додато и 10 уклоњено
  1. 10 10
      app/Services/Common/MemberService.php

+ 10 - 10
app/Services/Common/MemberService.php

@@ -56,32 +56,32 @@ class MemberService extends BaseService
     {
         $params = request()->all();
         $pageSize = $params['limit'] ?? 20;
-        $where = ['a.mark' => 1];
+        $where = ['member.mark' => 1];
         $status = isset($params['status']) ? $params['status'] : 0;
         if ($status > 0) {
-            $where['a.status'] = $status;
+            $where['member.status'] = $status;
         }
 
         $query = $this->model->with(['parent','account'])
-            ->from('member as a')
-            ->leftJoin('member as b','b.id','=','a.parent_id')
+            ->from('member')
+            ->leftJoin('member as b','b.id','=','member.parent_id')
             ->where($where)
             ->where(function ($query) use ($params) {
                 $keyword = isset($params['keyword']) ? $params['keyword'] : '';
                 if ($keyword) {
-                    $query->where('a.nickname', 'like', "%{$keyword}%")->orWhere('a.realname', 'like', "%{$keyword}%");
+                    $query->where('member.nickname', 'like', "%{$keyword}%")->orWhere('member.realname', 'like', "%{$keyword}%");
                 }
             })
             ->where(function ($query) use ($params) {
                 $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
                 if ($mobile) {
-                    $query->where('a.mobile', 'like', "%{$mobile}%");
+                    $query->where('member.mobile', 'like', "%{$mobile}%");
                 }
 
                 // 推荐人ID
                 $parentId = intval($params['parent_id']) ?? 0;
                 if ($parentId>0) {
-                    $query->where('a.parent_id', $parentId);
+                    $query->where('member.parent_id', $parentId);
                 }
 
                 $parent = isset($params['parent']) ? trim($params['parent']) : '';
@@ -95,10 +95,10 @@ class MemberService extends BaseService
 
 
             })
-            ->select(['a.*'])
+            ->select(['member.*'])
             ->withCount(['invites'])
-            ->orderBy('a.create_time', 'desc')
-            ->orderBy('a.id', 'desc');
+            ->orderBy('member.create_time', 'desc')
+            ->orderBy('member.id', 'desc');
         $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list ? $list->toArray() : [];