Merge branch 'wx-kw' into test

modules/Common/Services/BaseService.php

@@ -29,7 +29,7 @@ class BaseService
         ];
     }
 
-    protected static function throwErrMsg($msg, $code = "")
+    public static function throwErrMsg($msg, $code = "")
     {
         if ($code) {
             throw  new FailedException($msg, $code);

modules/WechatPlatform/Http/Controllers/WechatSubscribeController.php

@@ -33,6 +33,9 @@ class WechatSubscribeController extends CatchController
     public function list(Request $request)
     {
         $param  = $request->all();
+        if(!getProp('miniprogram_id')){
+            WechatSubscribeService::throwErrMsg("参数错误");
+        }
         $userContext = $this->getUserContext(null);
         $param['user_id'] = $userContext['loginUser']->id;
         $param['puser_id'] = $userContext['loginUser']->pid;

modules/WechatPlatform/Services/WechatKeywordsService.php

@@ -67,6 +67,9 @@ class WechatKeywordsService extends BaseService
         if (getProp($param, 'keyword')) {
             $sql->where('keyword', "like", "%" . $param['keyword'] . "%");
         }
+        if(getProp('miniprogram_id')){
+            $sql->where('miniprogram_id',  $param['miniprogram_id']);
+        }
         if(getProp($param,'wechat_authorization_info_id')){
             $sql->whereJsonContains('wechat_accounts->id',$param['wechat_authorization_info_id']);
         }

modules/WechatPlatform/Services/WechatSubscribeService.php

@@ -256,6 +256,9 @@ class WechatSubscribeService extends BaseService
         if (getProp($param, 'keyword')) {
             $sql->where('keyword', "like", "%" . $param['keyword'] . "%");
         }
+        if(getProp('miniprogram_id')){
+            $sql->where('miniprogram_id',  $param['miniprogram_id']);
+        }
         if(getProp($param,'wechat_authorization_info_id')){
             $sql->whereJsonContains('wechat_accounts->id',$param['wechat_authorization_info_id']);
         }