Browse Source

【Fix】修改微伴标签选择

liuxiangxin 2 tháng trước cách đây
mục cha
commit
2ecf6c17f4

+ 5 - 5
app/Http/Controllers/Admin/CouponActive.php

@@ -6,7 +6,7 @@ use App\Models\Business;
 use App\Models\Coupon\Active as Model;
 use App\Models\Coupon\ActiveCoupon as ActiveCoupon;
 use App\Models\City;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 use Intervention\Image\Facades\Image;
 
 /**
@@ -126,7 +126,7 @@ class CouponActive extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags,Business $Business){
+	public function add(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList,Business $Business){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -155,7 +155,7 @@ class CouponActive extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -174,7 +174,7 @@ class CouponActive extends Auth{
 	 * 修改
 	 * 
 	 * */
-	public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags,Business $Business){
+	public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList,Business $Business){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询用户
@@ -212,7 +212,7 @@ class CouponActive extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 5 - 5
app/Http/Controllers/Admin/LotteryOrder.php

@@ -5,7 +5,7 @@ use App\Http\Requests\Admin\Lottery\Order as Request;
 use App\Models\Lottery\Order as Model;
 use App\Models\City;
 use App\Models\Lottery\OrderReward;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 use Intervention\Image\Facades\Image;
 
 /**
@@ -126,7 +126,7 @@ class LotteryOrder extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function add(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -155,7 +155,7 @@ class LotteryOrder extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -174,7 +174,7 @@ class LotteryOrder extends Auth{
 	 * 修改
 	 * 
 	 * */
-	public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询用户
@@ -212,7 +212,7 @@ class LotteryOrder extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 5 - 5
app/Http/Controllers/Admin/LotteryRecruitment.php

@@ -5,7 +5,7 @@ use App\Http\Requests\Admin\Recruitment\Active as Request;
 use App\Models\Lottery\Recruitment as Model;
 use App\Models\Lottery\RecruitmentReward;
 use App\Models\City;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 
 /**
  * 优惠券自动发放规则
@@ -71,7 +71,7 @@ class LotteryRecruitment extends Auth{
      * 添加
      *
      * */
-    public function add(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+    public function add(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
         if( request()->isMethod('post') ){
             // 验证参数
             $request->scene('add')->validate();
@@ -108,7 +108,7 @@ class LotteryRecruitment extends Auth{
         // 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -128,7 +128,7 @@ class LotteryRecruitment extends Auth{
      * 修改
      *
      * */
-    public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+    public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
         // 接收参数
         $id							= request('id',0);
         // 查询用户
@@ -175,7 +175,7 @@ class LotteryRecruitment extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 5 - 5
app/Http/Controllers/Admin/LotteryScore.php

@@ -4,7 +4,7 @@ use App\Http\Requests\Admin\LotteryScore as Request;
 use App\Models\Lottery\Score as Model;
 use App\Models\City;
 use App\Models\Lottery\ScoreReward;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 use App\Facades\Servers\WechatMini\Mini;
 
 /**
@@ -71,7 +71,7 @@ class LotteryScore extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function add(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -102,7 +102,7 @@ class LotteryScore extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -121,7 +121,7 @@ class LotteryScore extends Auth{
 	 * 修改
 	 * 
 	 * */
-	public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询用户
@@ -161,7 +161,7 @@ class LotteryScore extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 8 - 9
app/Http/Controllers/Admin/Product.php

@@ -1,7 +1,6 @@
 <?php namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\Product as Request;
-use App\Models\AdminHistory;
 use App\Models\Business;
 use App\Models\City;
 use App\Models\OrdersProduct;
@@ -15,7 +14,7 @@ use App\Models\Product\Skus as ProductSkus;
 use App\Models\Product\City as ProductCity;
 use App\Models\ProductPhoto;
 use Illuminate\Support\Facades\DB;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 use Intervention\Image\Facades\Image;
 use Intervention\Image\Gd\Font;
 use App\Facades\Servers\WechatMini\Mini;
@@ -38,7 +37,7 @@ class Product extends Auth{
 	 * 首页列表
 	 * 
 	 * */
-    public function index(Model $Model,City $City,ProductCity $ProductCity,OrdersProduct $OrdersProduct,AdminHistory $AdminHistory,Business $Business){
+    public function index(Model $Model,City $City,ProductCity $ProductCity,OrdersProduct $OrdersProduct,Business $Business){
 		// 接受参数
 		$code					= request('product_code','');
 		$name					= request('name','');
@@ -245,7 +244,7 @@ class Product extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add(Request $request, Model $Model, WeiBanTags $WeiBanTags, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
+	public function add(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -446,7 +445,7 @@ class Product extends Auth{
 		$businessList 			= $Business->getListByAdmin();
 		$producerList			= $Producer->getList();
 		// 标签列表
-		$tagData				= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData				= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList				= [];
 		// 循环数据
@@ -468,7 +467,7 @@ class Product extends Auth{
 	 * 编辑
 	 * 
 	 * */
-	public function edit(Request $request, Model $Model, WeiBanTags $WeiBanTags, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
+	public function edit(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询数据
@@ -698,7 +697,7 @@ class Product extends Auth{
 		$businessList 			= $Business->getListByAdmin();
 		$producerList			= $Producer->getList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -725,7 +724,7 @@ class Product extends Auth{
 	 * 编辑
 	 * 
 	 * */
-	public function copy(Request $request, Model $Model, WeiBanTags $WeiBanTags, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
+	public function copy(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -953,7 +952,7 @@ class Product extends Auth{
 			$skuList[$key]			= $value;
 		}
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 5 - 5
app/Http/Controllers/Admin/Promo.php

@@ -7,7 +7,7 @@ use App\Models\PromoRebate;
 use App\Models\Product;
 use Illuminate\Support\Facades\DB;
 use App\Models\City;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 
 /**
  * 产品促销活动
@@ -93,7 +93,7 @@ class Promo extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add( Request $request, Model $Model,City $City,PromoRebate $PromoRebate,Product $Product,WeiBanTags $WeiBanTags,Business $Business){
+	public function add( Request $request, Model $Model,City $City,PromoRebate $PromoRebate,Product $Product,WeiBanTagList $WeiBanTagList,Business $Business){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -169,7 +169,7 @@ class Promo extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
         // 标签列表
-        $tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+        $tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
         $tagList					= [];
         // 循环数据
         foreach ($tagData as $value) {
@@ -189,7 +189,7 @@ class Promo extends Auth{
 	 * 编辑
 	 * 
 	 * */
-	public function edit( Request $request, Model $Model,City $City,PromoRebate $PromoRebate,Product $Product,WeiBanTags $WeiBanTags,Business $Business){
+	public function edit( Request $request, Model $Model,City $City,PromoRebate $PromoRebate,Product $Product,WeiBanTagList $WeiBanTagList,Business $Business){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询数据
@@ -288,7 +288,7 @@ class Promo extends Auth{
 		$cityList					= $City->getCityList();
 		$grantList					= $Model->getGrantTypeList();
         // 标签列表
-        $tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+        $tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
         // 标签列表
         $tagList					= [];
         // 循环数据

+ 5 - 6
app/Http/Controllers/Admin/RecruitmentActive.php

@@ -4,8 +4,7 @@ use App\Facades\Servers\WechatMini\Mini;
 use App\Http\Requests\Admin\RecruitmentActive as Request;
 use App\Models\RecruitmentActive as Model;
 use App\Models\City;
-use App\Models\WeiBan\Tags as WeiBanTags;
-use Illuminate\Support\Facades\DB;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 use Intervention\Image\Facades\Image;
 
 /**
@@ -157,7 +156,7 @@ class RecruitmentActive extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function add(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -188,7 +187,7 @@ class RecruitmentActive extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -207,7 +206,7 @@ class RecruitmentActive extends Auth{
 	 * 修改
 	 * 
 	 * */
-	public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询用户
@@ -248,7 +247,7 @@ class RecruitmentActive extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 5 - 6
app/Http/Controllers/Admin/RiddleActive.php

@@ -4,8 +4,7 @@ use App\Facades\Servers\WechatMini\Mini;
 use App\Http\Requests\Admin\Riddle\Active as Request;
 use App\Models\Riddle\Active as Model;
 use App\Models\City;
-use App\Models\WeiBan\Tags as WeiBanTags;
-use Intervention\Image\Facades\Image;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 
 /**
  * 灯谜活动规则
@@ -71,7 +70,7 @@ class RiddleActive extends Auth{
 	 * 添加
 	 * 
 	 * */
-	public function add(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function add(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -104,7 +103,7 @@ class RiddleActive extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据
@@ -123,7 +122,7 @@ class RiddleActive extends Auth{
 	 * 修改
 	 * 
 	 * */
-	public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+	public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
 		// 接收参数
 		$id							= request('id',0);
 		// 查询用户
@@ -165,7 +164,7 @@ class RiddleActive extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		// 标签列表
-		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+		$tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
 		// 标签列表
 		$tagList					= [];
 		// 循环数据

+ 5 - 5
app/Http/Controllers/Admin/ScoreClockinActive.php

@@ -5,7 +5,7 @@ use App\Http\Requests\Admin\ScoreClockinActive as Request;
 use App\Models\City;
 use App\Models\Score\ClockinActive as Model;
 use App\Models\Score\Clockin as Clockin;
-use App\Models\WeiBan\Tags as WeiBanTags;
+use App\Models\WeiBan\Taglist as WeiBanTagList;
 use Illuminate\Support\Facades\DB;
 use Intervention\Image\Facades\Image;
 
@@ -138,7 +138,7 @@ class ScoreClockinActive extends Auth{
      * 添加
      *
      * */
-    public function add(Request $request, Model $Model, City $City, WeiBanTags $WeiBanTags){
+    public function add(Request $request, Model $Model, City $City, WeiBanTagList $WeiBanTagList){
         if( request()->isMethod('post') ){
             // 验证参数
             $request->scene('add')->validate();
@@ -167,7 +167,7 @@ class ScoreClockinActive extends Auth{
         // 获取列表
         $cityList					= $City->getCityList();
         // 标签列表
-        $tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+        $tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
         // 标签列表
         $tagList					= [];
         // 循环数据
@@ -186,7 +186,7 @@ class ScoreClockinActive extends Auth{
      * 修改
      *
      * */
-    public function edit(Request $request,Model $Model,City $City,WeiBanTags $WeiBanTags){
+    public function edit(Request $request,Model $Model,City $City,WeiBanTagList $WeiBanTagList){
         // 接收参数
         $id							= request('id',0);
         // 查询用户
@@ -224,7 +224,7 @@ class ScoreClockinActive extends Auth{
         // 获取列表
         $cityList					= $City->getCityList();
         // 标签列表
-        $tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
+        $tagData					= $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
         // 标签列表
         $tagList					= [];
         // 循环数据

+ 2 - 2
app/Http/Controllers/Api/Lottery/Recruitment.php

@@ -44,7 +44,7 @@ class Recruitment extends Api{
 		// 如果城市限制并且不在在城市范围内,不允许参加
 		if ( $data['city_ids'] && !in_array($custom['city_id'],explode(',',$data['city_ids'])) ) return json_send(['code'=>'error','msg'=>'账号不在城市范围,请核对您的城市','data'=>['error'=>'不在标签范围内']]);
 		// 是否需要获取用户标签
-		$tags							= $data['tag_scope'] || $data['tag_except'] ? $WeiBanTags->getListByWeibanExtid($uid) : [];
+		$tags							= $data['tag_scope'] || $data['tag_except'] ? $WeiBanTags->getListByWeibanExtid($custom['weiban_extid']) : [];
 		// 获取用户的标签
 		$tags 							= $tags ? array_column($tags,'name') : [];
 		// 判断是不是可以参与
@@ -138,7 +138,7 @@ class Recruitment extends Api{
 		// 如果城市限制并且不在在城市范围内,不允许参加
 		if ( $data['city_ids'] && !in_array($custom['city_id'],explode(',',$data['city_ids'])) ) return json_send(['code'=>'error','msg'=>'账号不在城市范围,请核对您的城市','data'=>['error'=>'不在标签范围内']]);
 		// 是否需要获取用户标签
-		$tags							= $data['tag_scope'] || $data['tag_except'] ? $WeiBanTags->getListByWeibanExtid($uid) : [];
+		$tags							= $data['tag_scope'] || $data['tag_except'] ? $WeiBanTags->getListByWeibanExtid($custom['weiban_extid']) : [];
 		// 获取用户的标签
 		$tags 							= $tags ? array_column($tags,'name') : [];
 		// 判断是不是可以参与