Merge branch 'stable' of 121.36.198.49:zy_duanju/duanju_manage

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -74,9 +74,8 @@ class AdvertiserController extends CatchController
         $username = $request->input('username');
         $userContext = $this->getUserContext(null);
         $res =   DB::table('users')
-            ->join('user_has_miniprograms', 'users.id', 'user_has_miniprograms.uid')
+            ->leftJoin('user_has_miniprograms', 'users.id', 'user_has_miniprograms.uid')
             ->where([
-                'user_has_miniprograms.is_enabled' => 1,
                 'users.deleted_at' => 0,
             ])->where('users.pid', '<>', 0)
             ->when($userContext['loginUserRoles']->contains('company'), function ($query) use($userContext){
@@ -95,7 +94,7 @@ class AdvertiserController extends CatchController
             ->select(
                 'users.id', 'users.username', 'users.email', 'users.status', 'users.remark',
                 DB::raw("from_unixtime(users.created_at) as created_at"),
-                DB::raw("group_concat(distinct user_has_miniprograms.miniprogram_id separator ',') as miniProgramIds"),
+                DB::raw("group_concat(distinct if(user_has_miniprograms.is_enabled = 1, user_has_miniprograms.miniprogram_id, null)  separator ',') as miniProgramIds"),
                 DB::raw("NULL as miniPrograms")
             )->groupBy('users.id')
             ->orderBy('users.id','desc')

tests/Channel/Http/Controllers/AdvertiserControllerTest.php

@@ -31,7 +31,6 @@ class AdvertiserControllerTest extends UsedTestCase
         ])->json('get','http://localhost/api/channel/advertiser/listAdvertiser?'.http_build_query([
 //                'email' => 'aa1@test.com',
 //                'miniProgramId' => 3,
-            'username' => 'aa'
             ]));
         $res->dump();
     }