1

application/api/controller/screen/Index.php

@@ -19,7 +19,7 @@ class Index extends Controller
         $token = input('token','','trim');
 
         $str = think_decrypt($token);
-      //  $str = '4|3';
+       // $str = '4|100';
         $data = $str?explode('|',$str):[];
 
         if(count($data) != 2){

application/api/controller/screen/Waste.php

@@ -134,12 +134,12 @@ class Waste extends Index
             ->where('del',0)
             ->where('org_id',$this->orgId)
             ->where('create_yyyymmdd',date('Ymd'))
-            ->limit(30)
+            ->limit(20)
             ->select();
         foreach ($list as $k=>$v){
-            $list[$k]['device_name'] = Db::name('address')
-                ->where('id',$v['waste_device_id'])
-                ->value('title');
+            $list[$k]['user_name'] = Db::name('user')
+                ->where('id',$v['user_id'])
+                ->value('real_name');
             $list[$k]['device_name'] = Db::name('address')
                 ->where('id',$v['waste_device_id'])
                 ->value('title');