代码提交

Server/application/chukebao/controller/AccountsController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace app\chukebao\controller;
+
+use library\ResponseHelper;
+use think\Db;
+
+class AccountsController extends BaseController
+{
+    /**
+     * 获取账号列表（过滤掉后缀为 _offline 与 _delete 的账号）
+     * @return \think\response\Json
+     */
+    public function getList()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+        } catch (\Exception $e) {
+            return ResponseHelper::error($e->getMessage(), $e->getCode() ?: 401);
+        }
+
+        if (empty($companyId)) {
+            return ResponseHelper::error('请先登录', 401);
+        }
+
+        $page = max(1, intval($this->request->param('page', 1)));
+        $limit = max(1, intval($this->request->param('limit', 10)));
+        $keyword = trim((string)$this->request->param('keyword', ''));
+
+        $query = Db::table('s2_company_account')
+            ->alias('a')
+            ->where([
+                ['a.departmentId', '=', $companyId],
+                ['a.status', '=', 0],
+            ])
+            ->whereNotLike('a.userName', '%_offline')
+            ->whereNotLike('a.userName', '%_delete');
+
+        if ($keyword !== '') {
+            $query->where(function ($subQuery) use ($keyword) {
+                $likeKeyword = '%' . $keyword . '%';
+                $subQuery->whereLike('a.userName', $likeKeyword)
+                    ->whereOrLike('a.realName', $likeKeyword)
+                    ->whereOrLike('a.nickname', $likeKeyword);
+            });
+        }
+
+        $total = (clone $query)->count();
+        $list = $query->field([
+                'a.id',
+                'a.userName',
+                'a.realName',
+                'a.nickname',
+                'a.departmentId',
+                'a.departmentName',
+                'a.avatar'
+            ])
+            ->order('a.id', 'desc')
+            ->page($page, $limit)
+            ->select();
+
+
+
+        return ResponseHelper::success([
+            'total' => $total,
+            'list' => $list,
+        ]);
+    }
+}

Server/application/chukebao/controller/MessageController.php

@@ -20,7 +20,7 @@ class MessageController extends BaseController
 
         $friends = Db::table('s2_wechat_friend')
             ->where(['accountId' => $accountId, 'isDeleted' => 0])
-            ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId');
+            ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId,extendFields,phone,region');
 
 
         // 构建好友子查询
@@ -119,7 +119,11 @@ class MessageController extends BaseController
                 $v['groupId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['groupId'] : '';
                 $v['wechatAccountId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatAccountId'] : '';
                 $v['wechatId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatId'] : '';
+                $v['extendFields'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['extendFields'] : [];
+                $v['region'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['region'] : '';
+                $v['phone'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['phone'] : '';
                 $v['labels'] = !empty($friends[$v['wechatFriendId']]) ? json_decode($friends[$v['wechatFriendId']]['labels'], true) : [];
+
                 $unreadCount = isset($friendUnreadMap[$v['wechatFriendId']]) ? (int)$friendUnreadMap[$v['wechatFriendId']] : 0;
                 $v['aiType'] = isset($aiTypeData[$v['wechatFriendId']]) ? $aiTypeData[$v['wechatFriendId']] : 0;
                 unset($v['chatroomId']);
@@ -150,7 +154,6 @@ class MessageController extends BaseController
 
         }
         unset($v);
-
         return ResponseHelper::success($list);
     }
 

Server/application/chukebao/controller/WechatFriendController.php

@@ -36,7 +36,6 @@ class WechatFriendController extends BaseController
         foreach ($list as $k => &$v) {
             $v['labels'] = json_decode($v['labels'], true);
             $v['siteLabels'] = json_decode($v['siteLabels'], true);
-            $v['extendFields'] = json_decode($v['extendFields'], true);
             $v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s', $v['createTime']) : '';
             $v['updateTime'] = !empty($v['updateTime']) ? date('Y-m-d H:i:s', $v['updateTime']) : '';
             $v['passTime'] = !empty($v['passTime']) ? date('Y-m-d H:i:s', $v['passTime']) : '';