修改执行任务顺序

app/Console/Commands/SetSupplierFollowUp.php

@@ -31,6 +31,10 @@ class SetSupplierFollowUp extends Command
     public function handle()
     {
         $service = new DataService();
-        $service->makeTempTagForSupplier();
+        $service->transferAttachmentToNewTable();
+//        $service->importSupplierLevel();
+//        $service->changeSupplierTypeByIsType();
+//        $service->transferPayType();
+//        $service->makeTempTagForSupplier();
     }
 }

app/Http/Controllers/Filter/SupplierFilter.php

@@ -147,15 +147,15 @@ class SupplierFilter
                 $inUserIdSql = implode(',', $subordinateUserIds);
                 $inCodeIdSql = "(" . $inCodeIdSql . ")";
                 $inUserIdSql = "(" . $inUserIdSql . ")";
-                //为啥下面所有获取数据源约束的语句都要加上status=-3
-                //是因为无论什么角色,都可以看到黑名单
+                //为啥下面所有获取数据源约束的语句都要加上status=-3 或者 -2
+                //是因为无论什么角色,都可以看到黑名单和禁用供应商
                 if ($subordinateCodeIds) {
                     if ($canViewFakeSupplier) {
                         $query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql 
-                        or channel_uid REGEXP '$likeSqlRaw' or is_type = 1 or status = -3) "));
+                        or channel_uid REGEXP '$likeSqlRaw' or is_type = 1 or (status = -3 or status = -2)) "));
                     } else {
                         $query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql 
-                        or channel_uid REGEXP '$likeSqlRaw' or status = -3) "));
+                        or channel_uid REGEXP '$likeSqlRaw' or (status = -3 or status = -2)) "));
                     }
                 } else {
                     if ($canViewFakeSupplier) {