Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/DistMessageController.php

@@ -162,12 +162,20 @@ JS
             $form->multipleSelect('target_ids')
                ->options(DistAdminDistributor::tags_all())
                 ->saving(function ($value) {
+
+                    return $value;
+                    //dd($value);
                     // 转化成json字符串保存到数据库
-                    return json_encode($value);
+                    //return json_encode($value);
                 });
 
             $form->display('created_at');
             $form->display('updated_at');
+            $form->disableViewCheck();
+            $form->disableCreatingCheck();
+            $form->disableEditingCheck();
+
+
         });
     }
 }

app/Distributor/Repositories/DistAdminDistributor.php

@@ -124,7 +124,7 @@ class DistAdminDistributor extends EloquentRepository
         // 遍历结果并返回数组
         $tags = [];
         foreach ($result as $item) {
-            $tags[$item->id] = $item->company_name; // 假设 company_name 是你想要显示的字段
+            $tags[$item->id] = $item->client_code; // 假设 company_name 是你想要显示的字段
         }
 
         return $tags;

app/Distributor/Repositories/DistCustomMessage.php

@@ -89,10 +89,13 @@ class DistCustomMessage extends Repository
 
     public function getMessagesForUser($userId)
     {
+
+        //$userId=str($userId);
+
         return DistMessageModel::where('target_type', 'all')
             ->orWhere(function ($query) use ($userId) {
                 $query->where('target_type', 'users')
-                    ->whereJsonContains('target_ids', $userId);
+                    ->whereJsonContains('target_ids', str($userId));
             })
             ->with(['readStatuses' => function ($query) use ($userId) {
                 $query->where('user_id', $userId);
@@ -134,7 +137,7 @@ class DistCustomMessage extends Repository
                 $query->where('target_type', 'all')
                     ->orWhere(function ($query) use ($userId) {
                         $query->where('target_type', 'users')
-                            ->whereJsonContains('target_ids', $userId);
+                            ->whereJsonContains('target_ids', str($userId));
                     });
             })
             ->first();