allocation miniprogram

modules/Manage/Http/Controllers/UserMiniprogramController.php

@@ -72,7 +72,7 @@ class UserMiniprogramController extends CatchController
 
     public function getAllocationInfo($miniprogram_id){
         $all_company_account = UserService::listByRole(self::COMPANY_ROLE,['users.username','users.id']);
-        return $all_company_account->map(function ($item,$key) use($miniprogram_id) {
+        $result = $all_company_account->map(function ($item,$key) use($miniprogram_id) {
             $info = $this->userHasMiniprograms->where('uid',$item->id)->where('miniprogram_id',$miniprogram_id)->where('is_enabled',1)->count();
             if($info){
                 $item->user_has_miniprogram = 1;
@@ -82,7 +82,16 @@ class UserMiniprogramController extends CatchController
                 $item->user_has_miniprogram_flag = 'off';
             }
             return $item;
-        })->groupBy('user_has_miniprogram_flag')->all();
+        });
+        $group = $result->groupBy('user_has_miniprogram_flag')->toArray();
+        if(!isset($group['on'])){
+            $group['on'] = [];
+        }
+        if(!isset($group['off'])){
+            $group['off'] = [];
+        }
+        $group['all'] = $result->toArray();
+        return $group;
     }
 
 }