Merge remote-tracking branch 'origin/develop' into develop

app/Repositories/BeanRepository.php

@@ -233,10 +233,15 @@ class BeanRepository
             }
         }
         $user_info = $this->getUserInfo($invite_code = $request['invite_code']);
+        if ($user_info){
             $star_detail['invite']['uid'] = $user_info['uid'] ?? 0;
             $star_detail['invite']['username'] = $user_info['username'] ?? '';
             $star_detail['invite']['avatar'] = $user_info['avatar'] ?? '';
             $star_detail['invite']['bean'] = config("customer.share_post_bean") ?? 0;
+        }else{
+            return jsonError('邀请码有误');
+        }
+
         $star_detail['mybean']['user_count'] = intval($user_bean['user_count']) ?? 0;//已入驻居民
         $star_detail['mybean']['yesterday_add_user'] = intval($user_bean['yesterday_add_user']) ?? 0;//昨日新增居民
         $star_detail['mybean']['yesterday_quantity_issued'] = intval($yesterday_quantity_issued) ?? 0;//昨日发放总彩虹豆

app/Repositories/CategoryRepository.php

@@ -22,7 +22,7 @@ class CategoryRepository {
     {
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
         $where = [];
-        if(isset($request['is_suggest'])){
+        if(!empty($request['is_suggest'])){
             $where[] = ['is_suggest', '=', $request['is_suggest']];
         }
         return $this->category->where($where)->paginate($perPage);