完善功能

app/admin/controller/member/MemberController.php

@@ -21,10 +21,8 @@ class MemberController
 
         $res = Db::table('member')
             ->leftjoin('member_cert', 'member.member_id', '=', 'member_cert.join_cert_member_id')
-            ->leftjoin('member_account', 'member.member_id', '=', 'member_account.join_account_member_id')
             ->select('member.member_id', 'member.member_mobile', 'member_cert.member_cert_name','member_account.member_account_surplus')
             ->where('member.member_is_owner', $isOwner)
-            ->where('member_account.member_account_classify', 'CASH')
             ->where(function ($query) use ($keywords) {
                 $query->where('member.member_mobile', 'like', '%' . $keywords . '%')
                     ->orWhere("member.member_id", 'like', '%' . $keywords . '%')

app/admin/service/member/MemberService.php

@@ -26,7 +26,9 @@ class MemberService
         $rows = Member::where('member_is_owner', 'N')
             ->leftJoin('member_info', 'member_info.join_info_member_id', 'member.member_id')
             ->leftJoin('member_cert', 'member_cert.join_cert_member_id', 'member.member_id')
+            ->leftjoin('member_account', 'member.member_id', '=', 'member_account.join_account_member_id')
             ->leftJoin('member_role', 'member_role.member_role_id', 'member.join_member_role_id')
+            ->where('member_account.member_account_classify', 'CASH')
             ->when($name != '', function ($query) use ($name) {
                 $query->where('member_cert.member_cert_name', 'like', '%' . $name . '%');
             })->when($mobile != '', function ($query) use ($mobile) {
@@ -34,7 +36,8 @@ class MemberService
             })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes',
                 'member_info.member_info_nickname', 'member_info.member_info_headimg',
                 'member_role.member_role_id','member_role.member_role_name',
-                'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation'
+                'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation',
+                'member_account.member_account_surplus'
             );
         // 总条数
         $total = $rows->count('member_id');