From f8d544d12f47fd4c24a8801effb8a8b811a7e403 Mon Sep 17 00:00:00 2001
From: todaywindy <hant@cherrybless.com>
Date: Fri, 1 Aug 2025 09:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A7=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/workers/Worker.php | 11 +++++++----
 public/assets/js/backend/workers/worker.js      |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/admin/controller/workers/Worker.php b/application/admin/controller/workers/Worker.php
index d672241..c2f31bc 100644
--- a/application/admin/controller/workers/Worker.php
+++ b/application/admin/controller/workers/Worker.php
@@ -85,10 +85,11 @@ class Worker extends Backend
         $this->request->filter(['strip_tags', 'trim']);
         $items = $this->items;
         $filtered = array_filter($items, function ($item) {
-            return $item['pid'] == 0;
+            return $item['level'] == 2;
         });
 
         $pid_map = array_column($filtered, null, 'id');
+
         if ($this->request->isAjax()) {
             //如果发送的来源是Selectpage，则转发到Selectpage
             if ($this->request->request('keyField')) {
@@ -135,7 +136,8 @@ class Worker extends Backend
             $worker_ids = [];
             foreach ($list->items() as $item){
                 $dt = $item->toArray();
-                $tel = $dt['tel'];
+                preg_match_all('/\d+/', $dt['tel'], $matches);;
+                $tel = $matches[0][0] ?? '';
                 if (preg_match('/^\d{7,}$/', $tel)) {
                     $dt['tel'] = mb_substr($tel, 0, 3, 'UTF-8') . '****' . mb_substr($tel, -4, null, 'UTF-8');
                 } else {
@@ -145,8 +147,9 @@ class Worker extends Backend
                 $data[] = $dt;
                 $worker_ids [] = $item['id'];
             }
-            $worker_item = WorkerItem::whereIn('worker_id',$worker_ids)->where('item_path_id',1)
+            $worker_item = WorkerItem::whereIn('worker_id',$worker_ids)->where('item_path_id',2)
                 ->field('worker_id,item_id')->select();
+
             $worker_item_map = [];
 //            dd($worker_item);
             foreach ($worker_item as $item){
@@ -157,7 +160,7 @@ class Worker extends Backend
                 if (key_exists($datum['id'],$worker_item_map)){
                     foreach ($worker_item_map[$datum['id']] as $item){
                         if ($pid_map[$item] ?? false){
-                            $datum ['worker_item'][] = trim($pid_map[$item]['title']);
+                            $datum ['worker_item'][] = str_replace("&nbsp;",'',$pid_map[$item]['title']);
                         }
                     }
                 }else{
diff --git a/public/assets/js/backend/workers/worker.js b/public/assets/js/backend/workers/worker.js
index 0fa1f03..73f5ffc 100644
--- a/public/assets/js/backend/workers/worker.js
+++ b/public/assets/js/backend/workers/worker.js
@@ -59,7 +59,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree','cascader'],
                             },
                             {
                                 field: 'worker_item',
+                                width:500,
                                 title: '工种',
+                                operate: false,
+                                table: table,
+                                class: 'autocontent',
+                                formatter: Table.api.formatter.content
                             },
                             //{field: 'area_id', title: __('Area_id')},
                             //{field: 'lng', title: __('Lng'), operate:'BETWEEN'},