Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -277,7 +277,7 @@ class Report extends Base
         //统计条数的时候，不能按照status分组，否则下方列表不准
         $count = Db::name('purchease_order')
             ->alias('po')
-            ->leftJoin('depart_user du', 'du.uid=po.cgder_id')
+            ->leftJoin('depart_user du', 'du.uid=po.cgder_id AND du.is_del=0')
             ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->order('addtime,itemid')
@@ -287,7 +287,7 @@ class Report extends Base
 
         $list = Db::name('purchease_order')
             ->alias('po')
-            ->leftJoin('depart_user du', 'du.uid=po.cgder_id')
+            ->leftJoin('depart_user du', 'du.uid=po.cgder_id AND du.is_del=0')
             ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->order('addtime,itemid')
@@ -358,7 +358,7 @@ class Report extends Base
             ->alias('cb')
             ->field('DATE_FORMAT(cb.addtime,"%Y-%m-%d") addtime,du.itemid,cb.createrid,SUM(c.num) num,COUNT(cb.id) total,du.nickname,ci.name')
             ->leftJoin('consult_info c', 'c.zxNo=cb.zxNo')
-            ->leftJoin('depart_user du', 'du.uid=cb.createrid')
+            ->leftJoin('depart_user du', 'du.uid=cb.createrid AND du.is_del=0')
             ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->group('addtime,du.itemid,ci.name ,cb.createrid,du.nickname')
@@ -369,7 +369,7 @@ class Report extends Base
             ->alias('cb')
             ->field('DATE_FORMAT(cb.addtime,"%Y-%m-%d") addtime,du.itemid,cb.createrid,SUM(c.num) num,COUNT(cb.id) total,du.nickname,ci.name')
             ->leftJoin('consult_info c', 'c.zxNo=cb.zxNo')
-            ->leftJoin('depart_user du', 'du.uid=cb.createrid')
+            ->leftJoin('depart_user du', 'du.uid=cb.createrid AND du.is_del=0')
             ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->group('addtime,du.itemid,ci.name ,cb.createrid,du.nickname')
@@ -1595,12 +1595,11 @@ class Report extends Base
                         //状态
                         case 'status':
                             $all_status = [1 => '待完善成本', 2 => '待产品审核', 3 => '待财务定价', 4 => '待财务审核定价', 5 => '待上线', 6 => '上线成功', 7 => '审核失败', 8 => '已下线'];
-                            if (isset($before_info[$v])) $before_info[$v] = isset($all_status[$before_info[$v]])?$all_status[$before_info[$v]]:'';
-                            if (isset($after_info[$v])) $after_info[$v] = isset($all_status[$after_info[$v]])?$all_status[$after_info[$v]]:'';
+                            if (isset($before_info[$v])) $before_info[$v] = isset($all_status[$before_info[$v]]) ? $all_status[$before_info[$v]] : '';
+                            if (isset($after_info[$v])) $after_info[$v] = isset($all_status[$after_info[$v]]) ? $all_status[$after_info[$v]] : '';
 
                     }
 
-
                     $key = isset($this->good_field_title[$v]) ? $this->good_field_title[$v] : $v;
 
                     if (isset($before_info[$v])) $before_new[$key] = $before_info[$v];
@@ -1615,7 +1614,7 @@ class Report extends Base
             $list[] = $value;
 
         }
-        
+
         if (empty($list)) $list[] = '没有可供导出的数据';
 
         $headerArr = array_keys($list[0]);