添加商机审批

application/oa/logic/ExamineLogic.php

@@ -447,14 +447,15 @@ class ExamineLogic extends Common
                     ->count();
                 break;
             case 4:// 商机
-                $list = db('crm_bussiness')
+                $list = db('crm_business')
                     ->alias('a')
                     ->join('__ADMIN_USER__ user', 'user.id = a.create_user_id', 'LEFT')
                     ->join('__ADMIN_EXAMINE_FLOW__ examine_flow', 'examine_flow.flow_id = a.flow_id', 'LEFT')
                     ->where($where)
+                    ->where('a.is_end',['in',[1,2,3]])
                     ->where($whereOr)
                     ->field(
-                        'a.invoice_id as catagory_id ,a.invoice_apple_number as name,a.create_time,a.check_status,a.create_user_id,a.check_user_id,a.flow_user_id,user.realname,examine_flow.name as examine_name'
+                        'a.business_id as catagory_id ,a.name as name,a.create_time,a.check_status,a.create_user_id,a.check_user_id,a.flow_user_id,user.realname,examine_flow.name as examine_name'
                     )
                     ->page($param['page'], $param['limit'])
                     ->order('a.create_time desc')
@@ -463,7 +464,7 @@ class ExamineLogic extends Common
                     $list[$k]['create_user_info'] = $userModel->getUserById($v['create_user_id']);
 
                 }
-                $dataCount = db('crm_invoice')
+                $dataCount = db('crm_business')
                     ->alias('a')
                     ->join('__ADMIN_USER__ user', 'user.id = a.create_user_id', 'LEFT')
                     ->where($where)