fix

app/Model/IntracodeModel.php

@@ -86,7 +86,7 @@ class IntracodeModel extends Model
     }
     }
 
 
     //获取采购员和对应的编码
     //获取采购员和对应的编码
-    public function getChannelUsersEncode()
+    public function getChannelUsersEncode($includeResign = true)
     {
     {
         $redis = new RedisModel();
         $redis = new RedisModel();
         $result = json_decode($redis->get('department_user_encode_list'), true);
         $result = json_decode($redis->get('department_user_encode_list'), true);
@@ -102,13 +102,13 @@ class IntracodeModel extends Model
         $userChannel = $departmentService->getUserByDepartmentId(8);
         $userChannel = $departmentService->getUserByDepartmentId(8);
         $users = array_merge(array_merge($usersMarket, $usersOperation), $userChannel);
         $users = array_merge(array_merge($usersMarket, $usersOperation), $userChannel);
         $userIds = array_column($users, 'userId');
         $userIds = array_column($users, 'userId');
-        $users = $this->getEncodeByUserIds($userIds);
+        $users = $this->getEncodeByUserIds($userIds, $includeResign);
         $result = [];
         $result = [];
         foreach ($users as $code) {
         foreach ($users as $code) {
             $result[$code['code_id']] = $code['name'] . '(' . $code['code_id'] . ')';
             $result[$code['code_id']] = $code['name'] . '(' . $code['code_id'] . ')';
         }
         }
         $redis->set('department_user_encode_list', json_encode($result));
         $redis->set('department_user_encode_list', json_encode($result));
-        $redis->expire('department_user_encode_list', 600);
+        $redis->expire('department_user_encode_list', 10);
         return $result;
         return $result;
     }
     }
 
 
@@ -123,11 +123,12 @@ class IntracodeModel extends Model
         return $result;
         return $result;
     }
     }
 
 
-    public function getEncodeByUserIds($userIds = [])
+    public function getEncodeByUserIds($userIds = [], $includeResign = true)
     {
     {
-        $code = $this->where('admin_id', '>', 0)->join('user_info', 'lie_intracode.admin_id', '=', 'user_info.userId')
+        $query = $this->where('admin_id', '>', 0)->join('user_info', 'lie_intracode.admin_id', '=', 'user_info.userId')
             ->whereIn('user_info.userId', $userIds)
             ->whereIn('user_info.userId', $userIds)
-            ->select('code_id', 'admin_id', 'name', 'email', 'mobile')->get();
+            ->select('code_id', 'admin_id', 'name', 'email', 'mobile');
+        $code = $includeResign ? $query->get() : $query->where('user_info.status', '!=', 4)->get();
         if ($code) {
         if ($code) {
             $code = $code->toArray();
             $code = $code->toArray();
         }
         }