修复采购员显示问题

app/Http/Transformers/SupplierTransformer.php

@@ -66,7 +66,7 @@ class SupplierTransformer
     {
         $canViewAllChannelUser = checkPerm('ViewAllChannelUser');
         $intracodeModel = new IntracodeModel();
-        $userCodes = $intracodeModel->getSampleEncode();
+        $userCodes = $intracodeModel->getAllSampleEncode();
         $data = [];
         $channelUidList = explode(',', $channelUid);
         $channelUidList = array_unique($channelUidList);

app/Model/IntracodeModel.php

@@ -11,6 +11,7 @@ class IntracodeModel extends Model
     protected $table = 'lie_intracode';
     protected $primaryKey = 'code_id';
 
+    //不包含离职
     public function getEncode()
     {
         $redis = new RedisModel();
@@ -33,6 +34,27 @@ class IntracodeModel extends Model
         return $codeList;
     }
 
+    //包含离职的
+    public function getAllEncode()
+    {
+        $redis = new RedisModel();
+        $codeList = json_decode($redis->get('EncodedList_supplier'), true);
+        if (!$codeList) {
+            $codeList = $this->where('admin_id', '>', 0)->join('user_info', 'lie_intracode.admin_id', '=', 'user_info.userId')
+                ->select('code_id', 'admin_id', 'name', 'email')->get();
+            if ($codeList) {
+                $codeList = $codeList->toArray();
+                foreach ($codeList as $k => &$v) {
+                    if (empty($v['name'])) {
+                        $v['name'] = $v['email'];
+                    }
+                }
+                $redis->set('EncodedList_supplier', json_encode($codeList));
+                $redis->expire('EncodedList_supplier', 60 * 10);//缓存10分钟
+            }
+        }
+        return $codeList;
+    }
 
     //获取简单的内部用户数据
     public function getSampleEncode()
@@ -45,6 +67,17 @@ class IntracodeModel extends Model
         return $result;
     }
 
+    //获取简单的内部用户数据(包含离职)
+    public function getAllSampleEncode()
+    {
+        $codeList = $this->getAllEncode();
+        $result = [];
+        foreach ($codeList as $code) {
+            $result[$code['code_id']] = $code['name'] . '(' . $code['code_id'] . ')';
+        }
+        return $result;
+    }
+
     //获取采购员和对应的编码
     public function getChannelUsersEncode()
     {