Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/wechat/service/CustomService.php

@@ -123,7 +123,10 @@ class CustomService
             }];
         }
         if (!empty($params['current_status'])) {
-            $where[] = ['current_status', '=', $params['current_status']];
+            $currentStatus = $params['current_status'];
+            $where[] = [function($query) use ($currentStatus) {
+                $query->where('current_status', $currentStatus)->where('check_status', 2);
+            }];
         }
         if (!empty($params['created_at'])) {
             $createdAt = $params['created_at'];