Merge branch 'master' of https://git.7in6.com/Minong/mes-server-api

application/api/controller/Facility.php

@@ -503,8 +503,9 @@ class Facility extends Api
             }
             if (!empty($v['拉料'])){
                 $list[$k]['拉料姓名'] = \db('人事_基本资料')->where('员工编号',$v['拉料'])->value('rtrim(员工姓名) as 员工姓名');
-            }else{
-                $this[$k]['拉料姓名'] = '';
+            }
+            if (isset($list[$k]['拉料姓名']) === false){
+                $list[$k]['拉料姓名'] = '';
             }
             $list[$k]['印件及工序'] = $list[$k]['yjno'].'-'.$v['gxmc'];
             $list[$k]['生产时间段'] = substr($v['sj1'],5,5).' '.substr($v['sj1'],11,5).'<-->'.substr($v['sj2'],5,5).' '.substr($v['sj2'],11,5);