代码提交

Server/application/superadmin/controller/AdministratorController.php

@@ -94,16 +94,16 @@ class AdministratorController extends Controller
         $permissionIds = [];
         if (!empty($admin['permissions'])) {
             $permissions = json_decode($admin['permissions'], true);
-            $permissions = json_decode($permissions, true);
+            $permissions = is_array($permissions) ? $permissions: json_decode($permissions, true);
 
             if (isset($permissions['ids'])) {
                 $permissionIds = is_string($permissions['ids']) ? explode(',', $permissions['ids']) : $permissions['ids'];
-                
+
                 // 确保所有ID都是整数
                 $permissionIds = array_map('intval', $permissionIds);
             }
         }
-        
+
         // 格式化数据
         $data = [
             'id' => $admin['id'],
@@ -116,7 +116,7 @@ class AdministratorController extends Controller
             'lastLogin' => !empty($admin['lastLoginTime']) ? date('Y-m-d H:i', $admin['lastLoginTime']) : '从未登录',
             'permissions' => $permissionIds, // 直接返回权限ID数组
         ];
-        
+
         return json([
             'code' => 200,
             'msg' => '获取成功',

Server/application/superadmin/controller/TrafficPoolController.php

@@ -31,7 +31,7 @@ class TrafficPoolController extends Controller
             ->join('traffic_source ts', 'tp.identifier = ts.identifier', 'RIGHT')
             ->join('company c', 'ts.companyId = c.companyId', 'LEFT')
             ->join('wechat_account wa', 'tp.wechatId = wa.wechatId', 'LEFT')
-            ->join('wechat_tag wt', 'wa.wechatId = wt.wechatId')
+            ->join('wechat_tag wt', 'wa.wechatId = wt.wechatId', 'LEFT')
             ->field([
                 'ts.id',
                 'tp.wechatId',
@@ -43,9 +43,8 @@ class TrafficPoolController extends Controller
                 'wa.nickname',
                 'wa.region',
                 'wt.tags'
-            ])
-            ->order('tp.createTime DESC');
-        
+            ]);
+
         // 执行分页查询
         $list = $query->paginate([
             'list_rows' => $limit,
@@ -71,6 +70,8 @@ class TrafficPoolController extends Controller
             // 处理标签显示
             if (is_string($item['tags'])) {
                 $item['tags'] = json_decode($item['tags'], true);
+            } else {
+                $item['tags'] = [];
             }
             
             return $item;
@@ -104,7 +105,7 @@ class TrafficPoolController extends Controller
         try {
             // 查询流量来源信息
             $sourceInfo = TrafficSource::alias('ts')
-                ->join('company c', 'ts.companyId = c.id', 'LEFT')
+                ->join('company c', 'ts.companyId = c.companyId', 'LEFT')
                 ->field([
                     'ts.fromd as source',
                     'ts.createTime as addTime',