Merge branch 'wx-kw' into test

modules/WechatPlatform/Services/WechatKeywordsService.php

@@ -57,7 +57,7 @@ class WechatKeywordsService extends BaseService
             $val->wechat_accounts =  WechatAccountKeywordLog::query()->where(
                 ['weacht_keyworld_id' => $val->id,
                     'status' => 1
-                ])->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();;
+                ])->distinct("appid")->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();;
         }
         return $list;
     }
@@ -81,7 +81,7 @@ class WechatKeywordsService extends BaseService
             $ids = WechatAccountKeywordLog::query()->where([
                 'wechat_authorization_info_id' => $param['wechat_authorization_info_id'],
                 'status' => 1,
-            ])->pluck('weacht_keyworld_id')->toArray();
+            ])->distinct("weacht_keyworld_id")->pluck('weacht_keyworld_id')->toArray();
             $sql->whereIn('id',$ids);
         }
         return $sql;

modules/WechatPlatform/Services/WechatMenuService.php

@@ -314,7 +314,7 @@ class WechatMenuService extends BaseService
             $val->wechat_accounts =  WechatAccountMenuDetail::query()->where(
                 ['menu_id' => $val->id,
                     'status' => 1
-                ])->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();
+                ])->distinct('appid')->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();
         }
         return $list;
     }
@@ -338,7 +338,8 @@ class WechatMenuService extends BaseService
             $ids = WechatAccountMenuDetail::query()->where([
                 'wechat_authorization_info_id' => $param['wechat_authorization_info_id'],
                 'status' => 1,
-            ])->pluck('menu_id')->toArray();
+            ])->distinct('menu_id')->pluck('menu_id')->toArray();
+            $sql->whereIn('id',$ids);
         }
         return $sql;
     }

modules/WechatPlatform/Services/WechatSubscribeService.php

@@ -245,7 +245,7 @@ class WechatSubscribeService extends BaseService
             $val->wechat_accounts =  WechatAccountSubscribeDetail::query()->where(
                 ['subscribe_id' => $val->id,
                     'status' => 1
-                ])->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();
+                ])->distinct("appid")->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();
         }
         return $list;
     }
@@ -269,7 +269,7 @@ class WechatSubscribeService extends BaseService
             $ids = WechatAccountSubscribeDetail::query()->where([
                     'wechat_authorization_info_id' => $param['wechat_authorization_info_id'],
                     'status' => 1,
-                ])->pluck('subscribe_id')->toArray();
+                ])->distinct("subscribe_id")->pluck('subscribe_id')->toArray();
             $sql->whereIn('id',$ids);
         }
         return $sql;