From 16423d0185a58b2c1d06c3d037506d2aa69fa8b8 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 25 Nov 2023 16:10:19 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=BC=96=E8=BE=91=E5=85=A5=E8=82=A1?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/task_template/TaskTemplateLists.php         | 11 +++++++++++
 app/adminapi/lists/user/UserLists.php                 |  9 +++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/lists/task_template/TaskTemplateLists.php b/app/adminapi/lists/task_template/TaskTemplateLists.php
index eee030e33..ff0054e1a 100644
--- a/app/adminapi/lists/task_template/TaskTemplateLists.php
+++ b/app/adminapi/lists/task_template/TaskTemplateLists.php
@@ -19,6 +19,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\task_template\TaskTemplate;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\task_scheduling\TaskScheduling;
+use app\common\model\user\User;
 
 /**
  * 任务模板列表
@@ -59,6 +60,16 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
+            ->append(['task_admin_name'])
+            ->withAttr("task_admin_name", function ($value,$data) {
+                if ($data['type'] == 35) {
+                    $extend = json_decode($data['extend'], true);
+                    $userName = User::where('id', $extend['shareholder']['user_id'])->value('nickname');
+                    return $userName;
+                } else {
+                    return '';
+                }
+            })
             ->toArray();
     }
 
diff --git a/app/adminapi/lists/user/UserLists.php b/app/adminapi/lists/user/UserLists.php
index 578b4c89a..ee2036448 100755
--- a/app/adminapi/lists/user/UserLists.php
+++ b/app/adminapi/lists/user/UserLists.php
@@ -16,6 +16,7 @@ namespace app\adminapi\lists\user;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\enum\user\UserTerminalEnum;
 use app\common\lists\ListsExcelInterface;
+use app\common\model\Company;
 use app\common\model\contract\Contract;
 use app\common\model\user\User;
 use think\facade\Db;
@@ -37,7 +38,7 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
      */
     public function setSearch(): array
     {
-        $allowSearch = ['keyword', 'channel', 'create_time_start', 'create_time_end'];
+        $allowSearch = ['keyword', 'channel', 'create_time_start', 'create_time_end', 'company_id'];
         return array_intersect(array_keys($this->params), $allowSearch);
     }
 
@@ -69,11 +70,11 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
         }
         $field = "id,id contract,sn,nickname,sex,avatar,account,mobile,channel,create_time,admin_id,company_id,street,street as street_name,is_contract";
         $lists = User::withSearch($this->setSearch(), $this->params)
-            ->with(['company'])
-            ->where($where)
-            ->limit($this->limitOffset, $this->limitLength)
             ->field($field)
+            ->where($where)
+            ->with(['company'])
             ->order('id desc')
+            ->limit($this->limitOffset, $this->limitLength)
             ->select()
             ->toArray();