匿名与公开

app/Http/Controllers/Api/AskController.php

@@ -443,10 +443,10 @@ class AskController extends BaseController
         }
 
         //是否公开
-        $is_public = _empty_default_($request->is_public,'all');
+        /*$is_public = _empty_default_($request->is_public,'all');
         if($is_public != 'all'){
             $where[] = ['ask_order.is_public','=',$is_public];
-        }
+        }*/
 
         //搜索
         $keyword = _empty_default_($request->keyword,'');
@@ -461,6 +461,7 @@ class AskController extends BaseController
             ->select('ask_order.*','buser.user_avatar as blogger_avatar','buser.user_name as blogger_name','blogger.info as blogger_info')
             ->offset($offset)->limit($limit)
             ->where('ask_order.status',20)
+            ->where('ask_order.is_public',1)
             ->where($where)
             ->orderBy('ask_order.id','desc')
             ->get();
@@ -487,9 +488,11 @@ class AskController extends BaseController
         $info = json_decode(json_encode($info),true);
 
 
-        if($info['is_hidden'] == 1 && $info['user_id'] != $request->uid){
+        if($info['is_hidden'] == 0 && $info['blogger_id'] == $request->uid){
+            //登录者是答主，并且非匿名
+        }else{
             $info['user_avatar'] = 'https://img.yiyoujiayuan.cn/2025/03/20/0/b59ce3b31611a3bd82199c3183208a10.jpg';//匿名头像
-            $info['user_name'] = '匿名用户';
+            $info['user_name'] = '匿名用户的提问';
         }
 
         return $this->success($info);
@@ -516,7 +519,9 @@ class AskController extends BaseController
         $list = json_decode(json_encode($list),true);
 
         foreach($list as &$val){
-            if($val['is_hidden'] == 1){
+            if($val['is_hidden'] == 0 && $val['blogger_id'] == $request->uid){
+                //登录者是答主，并且非匿名
+            }else{
                 $val['user_avatar'] = 'https://img.yiyoujiayuan.cn/2025/03/20/0/b59ce3b31611a3bd82199c3183208a10.jpg';//匿名头像
                 $val['user_name'] = '匿名用户';
             }

app/Http/Controllers/Api/BloggerController.php

@@ -99,9 +99,6 @@ class BloggerController extends BaseController
 
         //搜索
         $keyword = _empty_default_($request->keyword,'');
-        if($keyword){
-            $where[] = ['ask_order.question','like','%'.$keyword.'%'];
-        }
 
         //
         $list = DB::table('blogger')