xxxrrrdddd 3 éve
szülő
commit
f3613c5f9a

+ 1 - 1
application/admin/controller/MobileFlow.php

@@ -70,7 +70,7 @@ class MobileFlow extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildindexparams();
 
             $list = $this->model
-                    ->with(['info','proxy'])
+                    ->with(['info'])
                 ->where('type',2)
                     ->where($where)
                     ->order($sort, $order)

+ 6 - 4
application/common/service/MobileImport.php

@@ -133,10 +133,12 @@ class MobileImport{
                 }
 
                 Db::startTrans();
-                $row['proxy_id']=Admin::where('nickname',$row['proxy_id'])->value('id');
-                if(!$row['proxy_id']){
-                    Db::rollback();
-                    continue;
+                if($type==1) {
+                    $row['proxy_id'] = Admin::where('nickname', $row['proxy_id'])->value('id');
+                    if (!$row['proxy_id']) {
+                        Db::rollback();
+                        continue;
+                    }
                 }
                 $row['admin_id']=$admin_id;
                 $row['type']=$type;

BIN
public/flow_export.xlsx