Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -88,12 +88,9 @@ class ProjectAssociationController extends BaseController
         $cache  = isset($cache);
         $cache  = isset($cache);
         $search = request()->input('search');
         $search = request()->input('search');
 //        $result = ProjectAssociationServices::getInstance()->getAiccWechatLists($isRes, $app, $cache);
 //        $result = ProjectAssociationServices::getInstance()->getAiccWechatLists($isRes, $app, $cache);
-        $result = ProjectAssociationServices::getInstance()->getWorkChatRoomList($search);
+        $result = ProjectAssociationServices::getInstance()->getWorkChatRoomList($search, $isRes->friend_id);
         $result['info'] = [
         $result['info'] = [
-            'friend_id' => $isRes->friend_id ?? 0,
-            'nickname'  => $isRes->nickname ?? '',
-            'user_name' => $isRes->user_name ?? '',
-            'image'     => $isRes->image ?? '',
+            'friend_id' => $isRes->friend_id ?? 0
         ];
         ];
         $this->response('success', Code::SUCCESS, $result);
         $this->response('success', Code::SUCCESS, $result);
     }
     }

@@ -158,11 +158,14 @@ class ProjectAssociationServices extends BaseService
      * @author zbj
      * @author zbj
      * @date 2024/9/7
      * @date 2024/9/7
      */
      */
-    public function getWorkChatRoomList($search = ''){
+    public function getWorkChatRoomList($search = '', $friend_id = 0){
         $param = [
         $param = [
             'search' => $search,
             'search' => $search,
             'time' => time(),
             'time' => time(),
         ];
         ];
+        if(!$search && $friend_id){
+            $param['friend_id'] = $friend_id;
+        }
         $param['sign'] = $this->getSign($param);
         $param['sign'] = $this->getSign($param);
         $url = 'https://hub.ai.cc/api/globalso_ai_customer_service/chatroom_list';
         $url = 'https://hub.ai.cc/api/globalso_ai_customer_service/chatroom_list';
         $result = Http::withoutVerifying()->post($url, $param)->json();
         $result = Http::withoutVerifying()->post($url, $param)->json();