|
@@ -18,7 +18,7 @@ class UserGroupController extends CatchController
|
|
|
*/
|
|
|
public function list(Request $request) {
|
|
|
$name = $request->input('name');
|
|
|
- DB::table('user_groups')
|
|
|
+ return DB::table('user_groups')
|
|
|
->when($name, function ($query, $name){
|
|
|
return $query->where('name', 'like', '%'.$name.'%');
|
|
|
})->where([
|
|
@@ -29,6 +29,34 @@ class UserGroupController extends CatchController
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 详情
|
|
|
+ * @param Request $request
|
|
|
+ * @throws \Illuminate\Validation\ValidationException
|
|
|
+ */
|
|
|
+ public function detail(Request $request) {
|
|
|
+ $this->validate($request, ['id' => 'required']);
|
|
|
+ $obj = DB::table('user_groups')
|
|
|
+ ->where([
|
|
|
+ 'uid' => $this->getLoginUserId(), 'is_enabled' => 1,
|
|
|
+ 'id' => $request->input('id')
|
|
|
+ ])->first();
|
|
|
+ if($obj) {
|
|
|
+ // ToDo:完善
|
|
|
+ $obj->user_num = '-1';
|
|
|
+ $obj->tags_arr = \json_decode($obj->tags, true);
|
|
|
+ $obj->gzh_nams = DB::table('gzh_ug_maps as a')
|
|
|
+ ->leftJoin('wechat_authorization_infos as b', function($query) {
|
|
|
+ $query->on('a.gzh_id', '=', 'b.id')
|
|
|
+ ->where('b.is_enabled', 1);
|
|
|
+ })->where([
|
|
|
+ 'ug_id' => $request->input('id')
|
|
|
+ ])->select('b.name')->get()->pluck('name')->toArray();
|
|
|
+ }
|
|
|
+
|
|
|
+ return $obj;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 添加用户分群
|
|
|
* @param Request $request
|
|
|
* @return string
|