Browse Source

Merge branch 'liuzj-1001016-dev' into test

liuzejian 1 year ago
parent
commit
ac0e4ded88
1 changed files with 2 additions and 2 deletions
  1. 2 2
      modules/Audience/Http/Controllers/UserGroupController.php

+ 2 - 2
modules/Audience/Http/Controllers/UserGroupController.php

@@ -53,7 +53,8 @@ class UserGroupController extends CatchController
                             'b.user_id' => $uid
                         ]);
                 })->where([
-                    'a.ug_id' => $request->input('id')
+                    'a.ug_id' => $request->input('id'),
+                    'a.is_enabled' => 1
                 ])->select('b.nick_name', 'b.authorizer_appid')->get();
             $tags = \json_decode($obj->tags, true);
             $tags['gzh_appids'] = $gzhInfo->pluck('authorizer_appid')->toArray();
@@ -141,7 +142,6 @@ class UserGroupController extends CatchController
     public function add(Request $request){
         $this->validate($request, [
             'name' => 'required|string|max:64',
-            'gzh_ids' => 'required|array',
             'tags' => 'required|array',
             'remark' => 'nullable|string|max:140'
         ]);