无修改

app/command/SyncData.php

@@ -35,25 +35,25 @@ class SyncData extends Command
                 $processedData = [];
 
                 foreach ($remoteRows as $row) {
-                    $operator = Db::name('company_operators')->where('operator_name', $row['operator'])->find();
+                    $operator = Db::name('company_operators')->where('operator_name', 'like', '%' . $row['operator'] . '%')->find();
 
                     $operator_id = $operator ? $operator['id'] : null;
                     $company_id = $operator ? $operator['company_id'] : null;
 
 
                     $processedData[] = [
-                        // 'id' => $row['id'], // 如果想用旧ID就取消注释，否则留空让本地表自增
-                        'website'     => $row['website_url'],
+                        'id' => $row['id'], // 如果想用旧ID就取消注释，否则留空让本地表自增
+                        'website'     => $row['website'],
                         'datanum'     => $row['datanum'],
-                        'create_time' => !empty($row['create_time']) ? strtotime($row['create_time']) : 0,
-                        'update_time' => !empty($row['update_time']) ? strtotime($row['update_time']) : 0,
+                        'create_time' => !empty($row['create_time']) ? $row['create_time'] : 0,
+                        'update_time' => !empty($row['update_time']) ? $row['update_time'] : 0,
                         'progress'    => $row['progress'],
                         'remark'      => $row['remark'] ?? '',
-                        'status'      => $row['is_completed'],
+                        'status'      => $row['is_complete'],
                         'lock_time'   => $row['lock_time'] ?? 0,
-                        'operator_id' => $operator_id,
-                        'company_id'  => $company_id,
-                        'user_id'    => $row['staff_id'] ?? null,
+                        'operator_id' => $operator_id ?? 0,
+                        'company_id'  => $company_id ?? 0,
+                        'user_id'    => $row['staff_id'] ?? 0,
                     ];
                 }
 

app/index/controller/ClientTicket.php

@@ -13,9 +13,9 @@ class ClientTicket extends BaseController
      */
     public function getClientTickets(ClientTicketService $ClientTicketService)
     {
-        $clientId = Session::get('user_info.id'); // 获取当前登录客户ID
+        $clientCompanyId = Session::get('user_info.company_id'); // 获取当前登录客户ID
         try {
-            $tickets = $ClientTicketService->getClientTickets($clientId);
+            $tickets = $ClientTicketService->getClientTickets($clientCompanyId);
             return json(['code' => 200, 'msg' => '获取成功', 'data' => $tickets]);
         } catch (\Exception $e) {
             return json(['code' => 400, 'msg' => $e->getMessage(), 'data' => null]);

app/index/service/ClientTicketService.php

@@ -2,20 +2,19 @@
 
 namespace app\index\service;
 
-use app\common\model\User as UserModel;
+use app\common\model\Tickets;
 
 
 class ClientTicketService
 {
     /* 获取客户关联工单 */
-    public function getClientTickets($clientId)
+    public function getClientTickets($clientCompanyId)
     {
-        # 查询当前登录用户所对应的工单
-
-        $tickets = UserModel::with(['tickets'])->find($clientId);
+        # 查询当前登录用户所对应的公司的工单
+        $tickets = Tickets::where('company_id', $clientCompanyId)->select();
 
         $newList = [];
-        foreach ($tickets->tickets as $ticket) {
+        foreach ($tickets as $ticket) {
             if (in_array($ticket->status, [0, 1, 2])) {
                 $ticket->visible(['id', 'website', 'datanum', 'progress', 'status']);
                 $newList[] = $ticket->toArray();

config/app.php

@@ -13,6 +13,7 @@ return [
     // 默认时区
     'default_timezone' => 'Asia/Shanghai',
 
+    'auto_multi_app' => true,
     // 应用映射（自动多应用模式有效）
     'app_map'          => [],
     // 域名绑定（自动多应用模式有效）

config/database.php

@@ -57,19 +57,18 @@ return [
             // 开启字段缓存
             'fields_cache'    => false,
         ],
+        'remote' => [
+            'type'            => 'mysql',
+            'hostname'        => '112.5.15.136',
+            'database'        => '112_5_15_136_255',
+            'username'        => '112_5_15_136_255',
+            'password'        => 'xz1YX1jswSWzkE4K',
+            'hostport'        => '3306',
+            'charset'         => 'utf8mb4',
+            'prefix'          => '', // 如果有表前缀请填写
+            'break_reconnect' => true, // 远程连接建议开启断线重连
+        ],
 
         // 更多的数据库配置信息
     ],
-    // 2. 新增：宝塔远程数据库连接
-    'remote' => [
-        'type'            => 'mysql',
-        'hostname'        => '127.0.0.1',
-        'database'        => '112_5_15_136_255',
-        'username'        => '112_5_15_136_255',
-        'password'        => 'xz1YX1jswSWzkE4K',
-        'hostport'        => '3306',
-        'charset'         => 'utf8mb4',
-        'prefix'          => '', // 如果有表前缀请填写
-        'break_reconnect' => true, // 远程连接建议开启断线重连
-    ],
 ];

config/route.php

@@ -23,7 +23,7 @@ return [
     // 默认的路由变量规则
     'default_route_pattern' => '[\w\.]+',
     // URL伪静态后缀
-    'url_html_suffix'       => 'html',
+    'url_html_suffix'       => '',
     // 访问控制器层名称
     'controller_layer'      => 'controller',
     // 空控制器名