修复在职问题

app/Http/Transformers/SupplierTransformer.php

@@ -131,6 +131,17 @@ class SupplierTransformer
                  //然后判断哪些是离职,哪些是在职的
                  //然后判断哪些是离职,哪些是在职的
                  foreach ($jdChannelUserNameList as $username) {
                  foreach ($jdChannelUserNameList as $username) {
                     if (!in_array($username, $onJobUserNameList)) {
                     if (!in_array($username, $onJobUserNameList)) {
+                        $jdResignChannelUserNameList[] = $username;
+                    } else {
+                        $jdOnJobChannelUserNameList[] = $username;
+                    }
+                }
+            }
+
+            if (!empty($supplier['channel_uid'])) {
+                //然后判断哪些是离职,哪些是在职的
+                foreach ($channelUserNameList as $username) {
+                   if (!in_array($username, $onJobUserNameList)) {
                        $resignChannelUserNameList[] = $username;
                        $resignChannelUserNameList[] = $username;
                    } else {
                    } else {
                        $onJobChannelUserNameList[] = $username;
                        $onJobChannelUserNameList[] = $username;
@@ -138,15 +149,14 @@ class SupplierTransformer
                }
                }
            }
            }
 
 
-
             $supplier['resign_channel_username'] = $resignChannelUserNameList ? implode(',',
             $supplier['resign_channel_username'] = $resignChannelUserNameList ? implode(',',
                 $resignChannelUserNameList) : '';
                 $resignChannelUserNameList) : '';
             $supplier['on_job_channel_username'] = $onJobChannelUserNameList ? implode(',',
             $supplier['on_job_channel_username'] = $onJobChannelUserNameList ? implode(',',
                 $onJobChannelUserNameList) : '';
                 $onJobChannelUserNameList) : '';
             $supplier['jd_resign_channel_username'] = $jdResignChannelUserNameList ? implode(',',
             $supplier['jd_resign_channel_username'] = $jdResignChannelUserNameList ? implode(',',
-                $resignChannelUserNameList) : '';
+                $jdResignChannelUserNameList) : '';
             $supplier['jd_on_job_channel_username'] = $jdOnJobChannelUserNameList ? implode(',',
             $supplier['jd_on_job_channel_username'] = $jdOnJobChannelUserNameList ? implode(',',
-                $onJobChannelUserNameList) : '';
+                $jdOnJobChannelUserNameList) : '';
         }
         }
         unset($supplier);
         unset($supplier);
         return $suppliers;
         return $suppliers;