bug修改

Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm
Merge pull request '待进入公海提醒' (#47 ) from zm into master
25 changed files with 2035 additions and 1464 deletions
--- a/application/admin/controller/ApiCommon.php
+++ b/application/admin/controller/ApiCommon.php
@ -12,6 +12,7 @@ use think\Request;
 use think\Db;
 use app\common\adapter\AuthAdapter;
 use app\common\controller\Common;
+use think\Session;


 class ApiCommon extends Common
@ -25,6 +26,9 @@ class ApiCommon extends Common

        $authKey = trim($header['authkey']);
        $sessionId = trim($header['sessionid']);
+        if ($authKey == "wxwork" && Session::get('user_id')) {
+            return;
+        }
        $paramArr = $request->param();
        $platform = $paramArr['platform'] ? '_'.$paramArr['platform'] : ''; //请求平台(mobile,ding)
        $cache = Cache::get('Auth_'.$authKey.$platform);
--- a/application/admin/controller/ExamineFlow.php
+++ b/application/admin/controller/ExamineFlow.php
@ -295,7 +295,7 @@ class ExamineFlow extends ApiCommon
        $flow_id = $param['flow_id'];
        $types = $param['types'];
        $types_id = $param['types_id'];
-        $typesArr = ['crm_contract', 'crm_receivables', 'crm_invoice', 'oa_examine', 'jxc_purchase', 'jxc_retreat', 'jxc_sale', 'jxc_salereturn', 'jxc_payment', 'jxc_collection', 'jxc_allocation', 'jxc_inventory'];
+        $typesArr = ['crm_customer_check','crm_business','crm_contract', 'crm_receivables', 'crm_invoice', 'oa_examine', 'jxc_purchase', 'jxc_retreat', 'jxc_sale', 'jxc_salereturn', 'jxc_payment', 'jxc_collection', 'jxc_allocation', 'jxc_inventory'];
        if (!$types || !in_array($types, $typesArr)) {
            return resultArray(['error' => '参数错误']);
        }
--- a/application/admin/logic/PoolConfigLogic.php
+++ b/application/admin/logic/PoolConfigLogic.php
@ -14,9 +14,9 @@ class PoolConfigLogic
     * 公海配置列表
     *
     * @param array $param page 页码，limit 每页条数
-     * @author fanqi
-     * @since 2021-03-30
     * @return array
+     * @since 2021-03-30
+     * @author fanqi
     */
    public function getPoolList($param)
    {
@ -33,11 +33,11 @@ class PoolConfigLogic
        # 统计公海下的客户数量
        $customerData = [];
        $customerList = db('crm_customer_pool_relation')->field(['pool_id', 'count(customer_id) AS customer_count'])->group('pool_id')->select();
-        foreach ($customerList AS $key => $value) {
+        foreach ($customerList as $key => $value) {
            $customerData[$value['pool_id']] = $value['customer_count'];
        }

-        foreach ($list AS $key => $value) {
+        foreach ($list as $key => $value) {
            # 公海管理员
            $adminUserIds = trim($value['admin_user_ids'], ',');
            $adminUserNames = db('admin_user')->whereIn('id', $adminUserIds)->column('realname');
@ -66,9 +66,9 @@ class PoolConfigLogic
     * 设置多公海配置
     *
     * @param $param
-     * @author fanqi
-     * @since 2021-03-30
     * @return bool
+     * @since 2021-03-30
+     * @author fanqi
     */
    public function setPoolConfig($param)
    {
@ -97,6 +97,11 @@ class PoolConfigLogic
            return false;
        }

+        if (empty($param['customer_type'])) {
+            $this->error = '请设置客户类型！';
+            return false;
+        }
+
        $repeatWhere['pool_name'] = $param['pool_name'];
        if (!empty($param['pool_id'])) $repeatWhere['pool_id'] = ['neq', $param['pool_id']];
        if (db('crm_customer_pool')->where($repeatWhere)->value('pool_id')) {
@ -118,7 +123,8 @@ class PoolConfigLogic
            'remain_day' => $param['remain_day'],
            'recycle_conf' => $param['recycle_conf'],
            'create_user_id' => $param['user_id'],
-            'create_time' => time()
+            'create_time' => time(),
+            'customer_type' => $param['customer_type'],
        ];

        Db::startTrans();
@ -161,9 +167,9 @@ class PoolConfigLogic
     * 公海配置详情
     *
     * @param int $poolId 公海ID
-     * @author fanqi
-     * @since 2021-03-30
     * @return array|bool
+     * @since 2021-03-30
+     * @author fanqi
     */
    public function readPool($poolId)
    {
@ -181,7 +187,7 @@ class PoolConfigLogic
        $adminUserIds = trim($data['admin_user_ids'], ',');
        $data['admin_user_ids'] = $adminUserIds;
        $data['admin_user_info'] = db('admin_user')->field(['id', 'realname', 'thumb_img'])->whereIn('id', $adminUserIds)->select();
-        foreach ($data['admin_user_info'] AS $key => $value) {
+        foreach ($data['admin_user_info'] as $key => $value) {
            $data['admin_user_info'][$key]['thumb_img'] = getFullPath($value['thumb_img']);
        }

@ -189,7 +195,7 @@ class PoolConfigLogic
        $userIds = trim($data['user_ids'], ',');
        $data['user_ids'] = $userIds;
        $data['user_info'] = db('admin_user')->field(['id', 'realname', 'thumb_img'])->whereIn('id', $userIds)->select();
-        foreach ($data['user_info'] AS $key => $value) {
+        foreach ($data['user_info'] as $key => $value) {
            $data['user_info'][$key]['thumb_img'] = getFullPath($value['thumb_img']);
        }

@ -203,7 +209,7 @@ class PoolConfigLogic

        # 公海规则
        $data['rule'] = db('crm_customer_pool_rule')->where('pool_id', $data['pool_id'])->select();
-        foreach ($data['rule'] AS $key => $value) {
+        foreach ($data['rule'] as $key => $value) {
            if (!empty($value['level'])) {
                $data['rule'][$key]['level'] = json_decode($value['level'], true);
                $data['rule'][$key]['level_setting'] = json_decode($value['level'], true);
@ -220,9 +226,9 @@ class PoolConfigLogic
     * 变更公海配置状态
     *
     * @param array $param pool_id 公海ID, status 状态（1启用、0停用）
-     * @author fanqi
-     * @since 2021-03-30
     * @return false|int|string
+     * @since 2021-03-30
+     * @author fanqi
     */
    public function changePoolStatus($param)
    {
@ -246,9 +252,9 @@ class PoolConfigLogic
     * 删除公海配置
     *
     * @param int $poolId 公海ID
-     * @author fanqi
-     * @since 2021-03-30
     * @return bool
+     * @since 2021-03-30
+     * @author fanqi
     */
    public function deletePool($poolId)
    {
@ -294,9 +300,9 @@ class PoolConfigLogic
     * 转移公海客户
     *
     * @param array $param source_pool_id 源公海ID，target_pool_id 目标公海ID
-     * @author fanqi
-     * @since 2021-03-30
     * @return bool
+     * @since 2021-03-30
+     * @author fanqi
     */
    public function transferPool($param)
    {
@ -313,7 +319,7 @@ class PoolConfigLogic
        $diffCustomerIds = array_diff($sourceCustomerIds, $targetCustomerIds);

        $data = [];
-        foreach ($diffCustomerIds AS $key => $value) {
+        foreach ($diffCustomerIds as $key => $value) {
            $data[] = [
                'customer_id' => $value,
                'pool_id' => $param['target_pool_id']
@ -340,9 +346,9 @@ class PoolConfigLogic
    /**
     * 获取客户级别列表
     *
-     * @author fanqi
-     * @since 2021-04-22
     * @return array
+     * @since 2021-04-22
+     * @author fanqi
     */
    public function getCustomerLevel()
    {
@ -357,9 +363,9 @@ class PoolConfigLogic
     * 获取公海字段列表
     *
     * @param array $param pool_id 公海ID
-     * @author fanqi
-     * @since 2021-04-29
     * @return bool|PDOStatement|string|Collection
+     * @since 2021-04-29
+     * @author fanqi
     */
    public function getPoolFieldList($param)
    {
@ -451,15 +457,15 @@ class PoolConfigLogic
     *
     * @param array $rules 规则数据
     * @param int $poolId 公海ID
-     * @author fanqi
-     * @since 2021-03-30
     * @return array
+     * @since 2021-03-30
+     * @author fanqi
     */
    private function getPoolRule($rules, $poolId)
    {
        $result = [];

-        foreach ($rules AS $key => $value) {
+        foreach ($rules as $key => $value) {
            $result[] = [
                'pool_id' => $poolId,
                'type' => $value['type'],
@ -467,7 +473,7 @@ class PoolConfigLogic
                'business_handle' => $value['business_handle'],
                'level_conf' => $value['level_conf'],
                'level' => json_encode($value['level']),
-                'limit_day' => !empty($value['limit_day']) ? $value['limit_day'] : 0
+                'limit_day' => !empty($value['limit_day']) ? $value['limit_day'] : 0,
            ];
        }

@ -479,15 +485,15 @@ class PoolConfigLogic
     *
     * @param array $fields 字段列表
     * @param int $poolId 公海ID
-     * @author fanqi
-     * @since 2021-03-30
     * @return array
+     * @since 2021-03-30
+     * @author fanqi
     */
    private function getPoolField($fields, $poolId)
    {
        $result = [];

-        foreach ($fields AS $key => $value) {
+        foreach ($fields as $key => $value) {
            $result[] = [
                'pool_id' => $poolId,
                'name' => $value['name'],
--- a/application/admin/model/ExamineStep.php
+++ b/application/admin/model/ExamineStep.php
@ -176,24 +176,58 @@ class ExamineStep extends Common
        }

        switch (trim($types)) {
-    		case 'oa_examine' : $dataInfo = db('oa_examine')->where(['examine_id' => intval($types_id)])->field('create_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'crm_contract' : $dataInfo = db('crm_contract')->where(['contract_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'crm_receivables' : $dataInfo = db('crm_receivables')->where(['receivables_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'crm_invoice': $dataInfo = db('crm_invoice')->where(['invoice_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_purchase': $dataInfo = db('jxc_purchase')->where(['purchase_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_retreat': $dataInfo = db('jxc_retreat')->where(['retreat_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_sale': $dataInfo = db('jxc_sale')->where(['sale_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_salereturn': $dataInfo = db('jxc_salereturn')->where(['salereturn_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_payment': $dataInfo = db('jxc_payment')->where(['payment_note_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_collection': $dataInfo = db('jxc_collection')->where(['collection_note_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_inventory': $dataInfo = db('jxc_inventory')->where(['inventory_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
-            case 'jxc_allocation': $dataInfo = db('jxc_allocation')->where(['allocation_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
+            case 'oa_examine' :
+                $dataInfo = db('oa_examine')->where(['examine_id' => intval($types_id)])->field('create_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'crm_contract' :
+                $dataInfo = db('crm_contract')->where(['contract_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'crm_receivables' :
+                $dataInfo = db('crm_receivables')->where(['receivables_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'crm_invoice':
+                $dataInfo = db('crm_invoice')->where(['invoice_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_purchase':
+                $dataInfo = db('jxc_purchase')->where(['purchase_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_retreat':
+                $dataInfo = db('jxc_retreat')->where(['retreat_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_sale':
+                $dataInfo = db('jxc_sale')->where(['sale_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_salereturn':
+                $dataInfo = db('jxc_salereturn')->where(['salereturn_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_payment':
+                $dataInfo = db('jxc_payment')->where(['payment_note_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_collection':
+                $dataInfo = db('jxc_collection')->where(['collection_note_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_inventory':
+                $dataInfo = db('jxc_inventory')->where(['inventory_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'jxc_allocation':
+                $dataInfo = db('jxc_allocation')->where(['allocation_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'crm_customer_check':
+                $dataInfo = db('crm_customer_check')->where(['customer_check_id' => intval($types_id)])->field('user_id,create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
+            case 'crm_business':
+                $dataInfo = db('crm_business')->where(['business_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find();
+                break;
        }
        $stepInfo = [];
        if ($dataInfo['flow_id'] && !in_array($dataInfo['check_status'], ['5'])) {
            //固定审批流
            $stepInfo = db('admin_examine_step')->where(['flow_id' => $dataInfo['flow_id'], 'order_id' => $dataInfo['order_id']])->find();
        }
+        if ($types=="crm_customer_check"){
+            $dataInfo['create_user_id']=$dataInfo['user_id'];
+            $dataInfo['owner_user_id']=$dataInfo['user_id'];
+        }
        $data = [];
        $data['stepInfo'] = $stepInfo;
        $data['step_id'] = $stepInfo['step_id'] ?: '';
@ -223,7 +257,9 @@ class ExamineStep extends Common
                }
                break;
            case 2 :
-            case 3 :$examine_user_id_arr = stringToArray($stepInfo['user_id']); break;
+            case 3 :
+                $examine_user_id_arr = stringToArray($stepInfo['user_id']);
+                break;
            case 4 :
                $order_id = $stepInfo['order_id'] ? $stepInfo['order_id'] - 1 : 0;
                $last_step_id = db('admin_examine_step')->where(['flow_id' => $stepInfo['flow_id'], 'order_id' => $order_id])->value('step_id');
@ -241,7 +277,8 @@ class ExamineStep extends Common
                    $examine_user_id_arr = stringToArray($examine_user_id);
                }
                break;
-            default : $examine_user_id_arr = [];
+            default :
+                $examine_user_id_arr = [];
        }
        return array_unique($examine_user_id_arr) ? ',' . implode(',', array_filter(array_unique($examine_user_id_arr))) . ',' : '';
    }
@ -278,10 +315,18 @@ class ExamineStep extends Common
        $adminUserId = model('User')->getAdminId(); //管理员ID
        //获取有审核权限的user_id
        switch ($types) {
-            case 'oa_examine' : $examine_user_id_arr = $userModel->getUserByPer('oa', 'examine', 'check'); break;
-            case 'crm_contract' : $examine_user_id_arr = $userModel->getUserByPer('crm', 'contract', 'check'); break;
-            case 'crm_receivables' : $examine_user_id_arr = $userModel->getUserByPer('crm', 'receivables', 'check'); break;
-            case 'crm_invoice' : $examine_user_id_arr = $userModel->getUserByPer('crm', 'invoice', 'check'); break;
+            case 'oa_examine' :
+                $examine_user_id_arr = $userModel->getUserByPer('oa', 'examine', 'check');
+                break;
+            case 'crm_contract' :
+                $examine_user_id_arr = $userModel->getUserByPer('crm', 'contract', 'check');
+                break;
+            case 'crm_receivables' :
+                $examine_user_id_arr = $userModel->getUserByPer('crm', 'receivables', 'check');
+                break;
+            case 'crm_invoice' :
+                $examine_user_id_arr = $userModel->getUserByPer('crm', 'invoice', 'check');
+                break;
        }
        $examine_user_id_arr = $examine_user_id_arr ? array_merge($examine_user_id_arr, $adminUserId) : $adminUserId;
        return $examine_user_id_arr;
--- a/application/admin/model/Field.php
+++ b/application/admin/model/Field.php
@ -485,7 +485,10 @@ class Field extends Model
            }

            //生成字段名
-            if (!$data['field']) $data['field'] = $this->createField($types, $types == 'oa_examine' ? 'oa_' : 'crm_');
+            if (!empty($param['field'])) {
+                $data['field'] = $param['field'];
+            } else if (!$data['field']) $data['field'] = $this->createField($types, $types == 'oa_examine' ? 'oa_' : 'crm_');
+

            $rule = [
                'field' => ['regex' => '/^[a-z]([a-z]|_)+[a-z]$/i'],
--- a/application/admin/model/Message.php
+++ b/application/admin/model/Message.php
@ -278,6 +278,22 @@ class Message extends Common
     *  客户待审批
     */
    const CUSTOMER_CHECK_PASS = 59;
+    /**
+     *  商机推进待审批
+     */
+    const BUSINESS_ADVANCE_CHECK_TO_DO = 60;
+    /**
+     *  商机推进待审批
+     */
+    const BUSINESS_ADVANCE_CHECK_REJECT = 61;
+    /**
+     *  商机推进待审批
+     */
+    const BUSINESS_ADVANCE_CHECK_PASS = 62;
+    /**
+     *  新商机
+     */
+    const BUSINESS_NEW = 63;

    /**
     * 消息类型
@ -389,6 +405,9 @@ class Message extends Common
        32 => [
            'template' => '{from_user} 将您添加为线索 {title} 的成员。',
        ],
+        63 => [
+            'template' => '{from_user} 创建了新的商机',
+        ]
    ];

    /**
@ -439,6 +458,10 @@ class Message extends Common
            self::CUSTOMER_CHECK_TO_DO,
            self::CUSTOMER_CHECK_REJECT,
            self::CUSTOMER_CHECK_PASS,
+            self::BUSINESS_ADVANCE_CHECK_TO_DO,
+            self::BUSINESS_ADVANCE_CHECK_REJECT,
+            self::BUSINESS_ADVANCE_CHECK_PASS,
+            self::BUSINESS_NEW,
        ],
        'jxc' => [
            self::PURCHASE_TO_DO,
@ -580,7 +603,6 @@ class Message extends Common
            case self::CUSTOMER_CHECK_PASS:
            case self::CUSTOMER_CHECK_REJECT:
                return CustomerCheck::where(['customer_check_id' => $data['action_id']])->value('name') ?: '';
-
            // 回款
            case self::RECEIVABLES_TO_DO:
            case self::RECEIVABLES_REJECT:
@ -610,6 +632,10 @@ class Message extends Common
            // 商机
            case self::TEAM_BUSINESS:
            case self::BUSINESS_PASS:
+            case self::BUSINESS_ADVANCE_CHECK_TO_DO:
+            case self::BUSINESS_ADVANCE_CHECK_REJECT:
+            case self::BUSINESS_ADVANCE_CHECK_PASS:
+            case self::BUSINESS_NEW:
                return BusinessModel::where(['business_id' => $data['action_id']])->value('name') ?: '';

            // 采购单
--- a/application/admin/model/User.php
+++ b/application/admin/model/User.php
@ -13,6 +13,7 @@ use app\admin\model\Common;
 use com\verify\HonrayVerify;
 use think\Cache;
 use think\Request;
+use think\Session;

 class User extends Common
 {
@ -647,8 +648,15 @@ class User extends Common
        $data['loginExpire'] = $loginExpire;
        //保存authKey信息
        $userData = [];
+
+        $wxuser_id = Session::get('wxuser_id');
+        if ($wxuser_id) {
+            $data['authKey'] = 'wxwork';
+            $userData['wxwork_id'] = $wxuser_id;
+        } else {
            $userData['authkey'] = $authKey;
            $userData['authkey_time'] = time() + $loginExpire;
+        }
        //把状态未激活至为启用
        if ($userInfo['status'] == 2) {
            $userData['status'] = 1;
--- a/application/common.php
+++ b/application/common.php
@ -69,7 +69,11 @@ function resultArray($array)
        $array['data'] = '';
    } elseif (isset($array['error'])) {
        $code = 400;
-        $array['data'] = '';
+        $array['data'] = '操作失败';
+    } elseif (isset($array['success'])) {
+        $array['error'] = '';
+        $array['data'] =$array['success'] ;
+        $code = 200;
    }
    return json([
        'code' => $code,
@ -834,7 +838,8 @@ function advancedQueryDataTransform($data, $condition)
 * @version: 11.1.0
 * Date: 2021/9/2 14:44
 */
-function advancedQueryDataUserform($data, $condition){
+function advancedQueryDataUserform($data, $condition)
+{
    if (in_array($condition, ['contains', 'notContains'])) {
        array_walk($data, function ($value, $key) use (&$data) {
            $data[$key] = $value;
@ -842,6 +847,7 @@ function advancedQueryDataUserform($data, $condition){
    }
    return $data;
 }
+
 /**
 * 等于（时间段）数据处理
 *
--- a/application/common/behavior/AuthenticateBehavior.php
+++ b/application/common/behavior/AuthenticateBehavior.php
@ -9,6 +9,7 @@ namespace app\common\behavior;
 use think\Cache;
 use think\Request;
 use think\Db;
+use think\Session;

 class AuthenticateBehavior
 {
@ -32,6 +33,9 @@ class AuthenticateBehavior
 		/*获取头部信息*/ 
        $header = $request->header();
        $authKey = trim($header['authkey']);
+        if ($authKey == "wxwork"  && Session::get('user_id')) {
+            return true;
+        }
        
 		$paramArr = $request->param();
        $platform = $paramArr['platform'] ? '_'.$paramArr['platform'] : ''; //请求分类(mobile,ding)
--- a/application/common/command/PoolCommand.php
+++ b/application/common/command/PoolCommand.php
@ -72,19 +72,25 @@ class PoolCommand extends Command
        $this->timer = Timer::add($this->interval, function () {
            # 只在凌晨12点至6点间执行
            if ((int)date('H') >= 0 && (int)date('H') < 6) {
+                $this->poolRecover();
+            }
+        });
+    }
+
+    public function poolRecover()
+    {
        # 公海规则
        $ruleList = db('crm_customer_pool_rule')->alias('rule')->field('rule.*')
-                    ->join('__CRM_CUSTOMER_POOL__ pool', 'pool.pool_id = rule.pool_id', 'LEFT')->where('pool.status', 1)->select();
-                
+            ->join('__CRM_CUSTOMER_POOL__ pool', 'pool.pool_id = rule.pool_id', 'LEFT')->field("pool.customer_type")->where('pool.status', 1)->select();
        if (!empty($ruleList)) {
            # 符合公海条件的客户IDS
-                    $customerIds = $this->getQueryCondition($ruleList);
+            $customerIds = PoolCommand::getQueryCondition($ruleList);

            # 整理客户公海关联数据
-                    $poolRelationData = $this->getCustomerPoolRelationData($customerIds);
+            $poolRelationData = PoolCommand::getCustomerPoolRelationData($customerIds);

            # 整理修改客户数据的条件（进入公海时间，前负责人...）
-                    $customerWhere = $this->getCustomerQueryCondition($customerIds);
+            $customerWhere = PoolCommand::getCustomerQueryCondition($customerIds);

            Db::startTrans();
            try {
@ -100,7 +106,7 @@ class PoolCommand extends Command
                        'into_pool_time' => time()
                    ]);
                }
-                        $this->updateInfo($ruleList,$customerWhere);
+                PoolCommand::updateInfo($ruleList, $customerWhere);
                # 删除联系人的负责人
                Db::name('crm_contacts')->whereIn('customer_id', $customerWhere)->update(['owner_user_id' => '']);

@ -110,8 +116,7 @@ class PoolCommand extends Command
            }
        }
    }
-        });
-    }
+
    /**
     * 自动入公海操作记录
     * @param $ruleList
@ -129,7 +134,7 @@ class PoolCommand extends Command
                if (!empty($v1['limit_day'])) {
                    $time = $v1['limit_day'];
                } else {
-                    $time = $this->getMinDay($levels);
+                    $time = PoolCommand::getMinDay($levels);
                }
            }
            foreach ($customerWhere as $val) {
@ -142,7 +147,6 @@ class PoolCommand extends Command
    }


-    
    protected function execute(Input $input, Output $output)
    {
        # 动态修改运行时参数
@ -227,9 +231,9 @@ class PoolCommand extends Command
        foreach ($rules as $k => $v) {

            if (!isset($result[$v['pool_id']])) $result[$v['pool_id']] = [];
-            if ($v['type'] == 1) $result[$v['pool_id']] = array_merge($result[$v['pool_id']], $this->getFollowUpQueryResult($v['level_conf'], $v['level'], $v['deal_handle'], $v['business_handle']));
-            if ($v['type'] == 2) $result[$v['pool_id']] = array_merge($result[$v['pool_id']], $this->getBusinessQueryResult($v['level_conf'], $v['level'], $v['deal_handle']));
-            if ($v['type'] == 3) $result[$v['pool_id']] = array_merge($result[$v['pool_id']], $this->getDealQueryResult($v['level_conf'], $v['level'], $v['business_handle']));
+            if ($v['type'] == 1) $result[$v['pool_id']] = array_merge($result[$v['pool_id']], PoolCommand::getFollowUpQueryResult($v['level_conf'], $v['level'], $v['deal_handle'], $v['business_handle'], $v['customer_type']));
+            if ($v['type'] == 2) $result[$v['pool_id']] = array_merge($result[$v['pool_id']], PoolCommand::getBusinessQueryResult($v['level_conf'], $v['level'], $v['deal_handle'], $v['customer_type']));
+            if ($v['type'] == 3) $result[$v['pool_id']] = array_merge($result[$v['pool_id']], PoolCommand::getDealQueryResult($v['level_conf'], $v['level'], $v['business_handle'], $v['customer_type']));
        }

        return $result;
@ -246,7 +250,7 @@ class PoolCommand extends Command
     * @since 2021-04-01
     * @author fanqi
     */
-    private function getFollowUpQueryResult($type, $levels, $dealStatus, $businessStatus)
+    private function getFollowUpQueryResult($type, $levels, $dealStatus, $businessStatus, $customerType)
    {
        # 转换格式
        $levels = json_decode($levels, true);
@ -278,10 +282,10 @@ class PoolCommand extends Command
            }

            # 获取最小天数，对于没有设置级别的客户数据使用
-            $minLimit = $this->getMinDay($levels);
+            $minLimit = PoolCommand::getMinDay($levels);
            $minTime = (time() - 24 * 60 * 60 * $minLimit);

-            $where .= " OR ((!`customer`.`level` AND `customer`.`last_time` < " . $minTime . " AND `customer`.`last_time` > `customer`.`obtain_time`) OR (!`customer`.`level` AND `customer`.`obtain_time` < " . $minTime . " AND `customer`.`obtain_time` > `customer`.`last_time`) OR (!`customer`.`level` AND `customer`.`obtain_time` < " . $minTime . " AND ISNULL(`customer`.`last_time`))) )";
+            $where .= " OR ((ISNULL(`customer`.`level`) AND `customer`.`last_time` < " . $minTime . " AND `customer`.`last_time` > `customer`.`obtain_time`) OR (ISNULL(`customer`.`level`) AND `customer`.`obtain_time` < " . $minTime . " AND `customer`.`obtain_time` > `customer`.`last_time`) OR (ISNULL(`customer`.`level`) AND `customer`.`obtain_time` < " . $minTime . " AND ISNULL(`customer`.`last_time`))) )";
        }

        # 选择不进入公海的客户（已成交客户）
@ -296,7 +300,7 @@ class PoolCommand extends Command
        # 查询符合条件的客户
        return db('crm_customer')
            ->alias('customer')->join('__CRM_BUSINESS__ business', 'business.customer_id = customer.customer_id', 'LEFT')
-            ->where($where)->column('customer.customer_id');
+            ->where($where)->where(['customer.crm_lthugd' => array('in', $customerType)])->column('customer.customer_id');
    }

    /**
@ -309,7 +313,7 @@ class PoolCommand extends Command
     * @since 2021-04-01
     * @author fanqi
     */
-    private function getBusinessQueryResult($type, $levels, $dealStatus)
+    private function getBusinessQueryResult($type, $levels, $dealStatus, $customerType)
    {
        # 转换格式
        $levels = json_decode($levels, true);
@ -341,10 +345,10 @@ class PoolCommand extends Command
            }

            # 获取最小天数，对于没有设置级别的客户数据使用
-            $minLimit = $this->getMinDay($levels);
+            $minLimit = PoolCommand::getMinDay($levels);
            $minTime = (time() - 24 * 60 * 60 * $minLimit);

-            $where .= " OR ((ISNULL(`business`.`customer_id`) AND `customer`.`obtain_time` < " . $minTime . " AND !`customer`.`level`) OR (`customer`.`obtain_time` < " . $minTime . "  AND `customer`.`obtain_time` > `business`.`create_time`  AND !`customer`.`level`) OR (`business`.`create_time` < " . $minTime . " AND `business`.`create_time` > `customer`.`obtain_time` AND !`customer`.`level`)) )";
+            $where .= " OR ((ISNULL(`business`.`customer_id`) AND `customer`.`obtain_time` < " . $minTime . " AND ISNULL(`customer`.`level`)) OR (`customer`.`obtain_time` < " . $minTime . "  AND `customer`.`obtain_time` > `business`.`create_time`  AND ISNULL(`customer`.`level`)) OR (`business`.`create_time` < " . $minTime . " AND `business`.`create_time` > `customer`.`obtain_time` AND ISNULL(`customer`.`level`))) )";
        }

        # 选择不进入公海的客户（已成交客户）
@ -356,7 +360,7 @@ class PoolCommand extends Command
        # 查询匹配条件的客户
        return db('crm_customer')->alias('customer')
            ->join('__CRM_BUSINESS__ business', 'business.customer_id = customer.customer_id', 'LEFT')
-            ->where($where)->column('customer.customer_id');
+            ->where($where)->where(['customer.crm_lthugd' => array('in', $customerType)])->column('customer.customer_id');
    }

    /**
@ -369,7 +373,7 @@ class PoolCommand extends Command
     * @since 2021-04-01
     * @author fanqi
     */
-    private function getDealQueryResult($type, $levels, $businessStatus)
+    private function getDealQueryResult($type, $levels, $businessStatus, $customerType)
    {
        # 转换格式
        $levels = json_decode($levels, true);
@ -401,10 +405,10 @@ class PoolCommand extends Command
            }

            # 获取最小天数，对于没有设置级别的客户数据使用
-            $minLimit = $this->getMinDay($levels);
+            $minLimit = PoolCommand::getMinDay($levels);
            $minTime = (time() - 24 * 60 * 60 * $minLimit);

-            $where .= " OR ((ISNULL(`contract`.`customer_id`) AND `customer`.`obtain_time` < " . $minTime . " AND !`customer`.`level`) OR (`customer`.`obtain_time` < " . $minTime . " AND `customer`.`obtain_time` > `contract`.`create_time` AND !`customer`.`level`) OR (`contract`.`create_time` < " . $minTime . " AND `contract`.`create_time` > `customer`.`obtain_time` AND !`customer`.`level`)) )";
+            $where .= " OR ((ISNULL(`contract`.`customer_id`) AND `customer`.`obtain_time` < " . $minTime . " AND ISNULL(`customer`.`level`)) OR (`customer`.`obtain_time` < " . $minTime . " AND `customer`.`obtain_time` > `contract`.`create_time` AND ISNULL(`customer`.`level`)) OR (`contract`.`create_time` < " . $minTime . " AND `contract`.`create_time` > `customer`.`obtain_time` AND ISNULL(`customer`.`level`))) )";
        }

        # 选择不进入公海的客户（有商机客户）
@ -417,7 +421,7 @@ class PoolCommand extends Command
        return db('crm_customer')->alias('customer')
            ->join('__CRM_BUSINESS__ business', 'business.customer_id = customer.customer_id', 'LEFT')
            ->join('__CRM_CONTRACT__ contract', 'contract.customer_id = customer.customer_id', 'LEFT')
-            ->where($where)->column('customer.customer_id');
+            ->where($where)->where(['customer.crm_lthugd' => array('in', $customerType)])->column('customer.customer_id');
    }

    /**
--- a/application/common/wework/api/Api.php
+++ b/application/common/wework/api/Api.php
@ -13,6 +13,9 @@ class Api {

    protected static $getAccessToken = 'gettoken';
    protected static $contactInfo = 'externalcontact/get';
+    protected static $getUserInfo = 'auth/getuserinfo';
+
+    protected static $userGet = 'user/get';

    protected $corpId = '';
    protected $corpSecret = '';
@ -37,6 +40,30 @@ class Api {
        ]);
    }

+    /**
+     * 获取用户身份
+     * @param $code
+     * @return mixed
+     */
+    function getUserInfo($code) {
+        return $this->get(self::$getUserInfo, [
+            'access_token' => $this->getAccessToken(),
+            'code' => $code
+        ]);
+    }
+
+    /**
+     * 获取用户信息
+     * @param $code
+     * @return mixed
+     */
+    function userGet($userid) {
+        return $this->get(self::$userGet, [
+            'access_token' => $this->getAccessToken(),
+            'userid' => $userid
+        ]);
+    }
+
    /**
     * 获取accessToken
     * @return false|mixed
--- a/application/crm/controller/Business.php
+++ b/application/crm/controller/Business.php
@ -8,6 +8,9 @@
 namespace app\crm\controller;

 use app\admin\controller\ApiCommon;
+use app\admin\model\Message;
+use app\admin\model\User;
+use app\crm\logic\CustomerPoolLogic;
 use app\crm\traits\SearchConditionTrait;
 use app\crm\traits\StarTrait;
 use think\Hook;
@ -28,7 +31,7 @@ class Business extends ApiCommon
    {
        $action = [
            'permission' => [''],
-            'allow' => ['statuslist', 'advance', 'product', 'system', 'count', 'setprimary']
+            'allow' => ['statuslist', 'advance', 'product', 'system', 'count', 'setprimary', 'check']
        ];
        Hook::listen('check_auth', $action);
        $request = Request::instance();
@ -372,7 +375,7 @@ class Business extends ApiCommon
    }

    /**
-     * 商机状态推进
+     * 商机审批提交
     * @param business_id 商机ID
     * @param status_id 推进商机状态ID
     * @return
@ -381,31 +384,91 @@ class Business extends ApiCommon
    public function advance()
    {
        $param = $this->param;
+        $examineStepModel = new \app\admin\model\ExamineStep();
+        $examineStatus = $param['examineStatus'] ?? 1; // 审批是否停用
        $userInfo = $this->userInfo;
        $userModel = new \app\admin\model\User();
        $is_end = $param['is_end'] ?: 0; //1赢单2输单3无效
        $remark = $param['statusRemark'];
+        unset($param['examineStatus']);
+
        if (!$param['business_id']) {
            return resultArray(['error' => '参数错误']);
        }
        $businessInfo = db('crm_business')->where(['business_id' => $param['business_id']])->find();
        if ($businessInfo['is_end']) {
-            return resultArray(['error' => '已结束，不能推进']);
+            return resultArray(['error' => '已结束，请勿重复提交']);
+        }
+        if ($businessInfo['flow_id'] && [$businessInfo]['check_status'] != 0) {
+            return resultArray(['error' => '已有审批流程，请勿重复提交']);
        }

        $data = [];
-        $data['update_time'] = time();
-        $data['is_end'] = $is_end;
-        $data['remark'] = $remark;
-        $data['check_status'] = 1;
-        $data['flow_id'] = 13;
-        $data['check_user_id'] = $param['check_user_id'];
-        $data['flow_user_id'] = $param['check_user_id'];
+        $data['submit_end_status'] = $is_end;
+        $data['submit_remark'] = $remark;
+        $data['check_status'] = 0;
+        if (($examineStatus != false && $examineStatus != 'false') || $examineStatus == 1) {
+            // 审核判断（是否有符合条件的审批流）
+            $examineFlowModel = new \app\admin\model\ExamineFlow();
+            if (!$examineFlowModel->checkExamine($userInfo['id'], 'crm_business')) {
+                return resultArray(['error' => '暂无审批人，无法创建']);
+            }
+            //添加审批相关信息
+            $examineFlowData = $examineFlowModel->getFlowByTypes($userInfo['id'], 'crm_business');
+            if (!$examineFlowData) {
+                return resultArray(['error' => '无可用审批流，请联系管理员']);
+            }
+            $data['flow_id'] = $examineFlowData['flow_id'];
+            //获取审批人信息
+            if ($examineFlowData['config'] == 1) {
+                //固定审批流
+                $nextStepData = $examineStepModel->nextStepUser($userInfo['id'], $examineFlowData['flow_id'], 'crm_business', 0, 0, 0);
+                $next_user_ids = arrayToString($nextStepData['next_user_ids']) ?: '';
+                $check_user_id = $next_user_ids ?: [];
+                $data['order_id'] = 1;
+            } else {
+                $check_user_id = $param['check_user_id'] ? ',' . $param['check_user_id'] . ',' : '';
+            }
+            if (!$check_user_id) {

+                return resultArray(['error' => '无可用审批人，请联系管理员']);
+            }
+            $data['check_user_id'] = is_array($check_user_id) ? ',' . implode(',', $check_user_id) . ',' : $check_user_id;
+        } else {
+            # 审批流停用，将状态改为审核通过
+            // $param['check_status'] = 2;
+
+            # 审批流停用，将状态改为正常   zjf 20210727  默认值为7
+            $data['check_status'] = 7;
+        }
        $res = db('crm_business')->where(['business_id' => $param['business_id']])->update($data);
        if (!$res) {
-            return resultArray(['error' => '推进失败，请重试']);
+            return resultArray(['error' => '提交失败，请重试']);
+        }
+        //站内信
+        $send_user_id = stringToArray($param['check_user_id']);
+        if ($send_user_id && empty($param['check_status'])) {
+            (new Message())->send(
+                Message::CUSTOMER_CHECK_TO_DO,
+                [
+                    'title' => $param['name'],
+                    'action_id' => $param['business_id'],
+                ],
+                $send_user_id
+            );
+        }
+        # 创建待办事项的关联数据
+        $checkUserIds = db('crm_business')->where('business_id', $param['business_id'])->value('check_user_id');
+        $checkUserIdArray = stringToArray($checkUserIds);
+        $dealtData = [];
+        foreach ($checkUserIdArray as $kk => $vv) {
+            $dealtData[] = [
+                'types' => 'crm_business',
+                'types_id' => $param['business_id'],
+                'user_id' => $vv
+            ];
        }
+        if (!empty($dealtData)) db('crm_dealt_relation')->insertAll($dealtData);
        return resultArray(['success' => '提交成功']);
    }

@ -569,23 +632,151 @@ class Business extends ApiCommon

    public function check()
    {
-
        $param = $this->param;
+        $userInfo = $this->userInfo;
+        $user_id = $userInfo['id'];
+        $businessModel = model('Business');
+        $examineStepModel = new \app\admin\model\ExamineStep();
+        $examineRecordModel = new \app\admin\model\ExamineRecord();
+        $examineFlowModel = new \app\admin\model\ExamineFlow();
+        $customerModel = model('Customer');
+
+        $businessCheckData = [];
+        $businessCheckData['update_time'] = time();
+        $businessCheckData['check_status'] = 1; //0待审核，1审核通中，2审核通过，3审核未通过
+        //权限判断
+        if (!$examineStepModel->checkExamine($user_id, 'crm_business', $param['id'])) {
+            return resultArray(['error' => $examineStepModel->getError()]);
+        }
+        //审批主体详情
+        $dataInfo = $businessModel->getDataById($param['id']);
+        $flowInfo = $examineFlowModel->getDataById($dataInfo['flow_id']);
+        $is_end = 0; // 1审批结束
+
+        $status = $param['status'] ? 1 : 0; //1通过，0驳回
+        $checkData = [];
+        $checkData['check_user_id'] = $user_id;
+        $checkData['types'] = 'crm_business';
+        $checkData['types_id'] = $param['id'];
+        $checkData['check_time'] = time();
+        $checkData['content'] = $param['content'];
+        $checkData['flow_id'] = $dataInfo['flow_id'];
+        $checkData['order_id'] = $dataInfo['order_id'] ?: 1;
+        $checkData['status'] = $status;
+
+        if ($status == 1) {
+            if ($flowInfo['config'] == 1) {
+                //固定流程
+                //获取下一审批信息
+                $nextStepData = $examineStepModel->nextStepUser($dataInfo['owner_user_id'], $dataInfo['flow_id'], 'crm_business', $param['id'], $dataInfo['order_id'], $user_id);
+                $next_user_ids = $nextStepData['next_user_ids'] ?: [];
+                $businessCheckData['order_id'] = $nextStepData['order_id'] ?: '';
+                if (!$next_user_ids) {
+                    $is_end = 1;
+                    //审批结束
+                    $checkData['check_status'] = !empty($status) ? 2 : 3;
+                    $businessCheckData['check_user_id'] = '';
+                } else {
+                    //修改主体相关审批信息
+                    $businessCheckData['check_user_id'] = arrayToString($next_user_ids);
+                }
+            } else {
+                //自选流程
+                $is_end = $param['is_end'] ? 1 : '';
+                $check_user_id = $param['check_user_id'] ?: '';
+                if ($is_end !== 1 && empty($check_user_id)) {
+                    return resultArray(['error' => '请选择下一审批人']);
+                }
+                $businessCheckData['check_user_id'] = arrayToString($param['check_user_id']);
+            }
+            if ($is_end == 1) {
+                $checkData['check_status'] = !empty($status) ? 2 : 3;
+                $businessCheckData['check_user_id'] = '';
+                $businessCheckData['check_status'] = 2;
+            }
+        } else {
+            //审批驳回
+            $is_end = 1;
+            $businessCheckData['check_status'] = 3;
+            //将审批记录至为无效
+            // $examineRecordModel->setEnd(['types' => 'crm_contract','types_id' => $param['id']]);
+        }
+        //已审批人ID
+        $businessCheckData['flow_user_id'] = stringToArray($dataInfo['flow_user_id']) ? arrayToString(array_merge(stringToArray($dataInfo['flow_user_id']), [$user_id])) : arrayToString([$user_id]);
+        $resBusiness = db('crm_business')->where(['business_id' => $param['id']])->update($businessCheckData);
+        if ($resBusiness) {
+            //审批记录
+            $resRecord = $examineRecordModel->createData($checkData);
+            //审核通过，修改相关信息
+            if ($is_end == 1 && !empty($status)) {
+                // 审批通过消息告知负责人
+                (new Message())->send(
+                    Message::BUSINESS_ADVANCE_CHECK_PASS,
+                    [
+                        'title' => $dataInfo['name'],
+                        'action_id' => $param['id']
+                    ],
+                    $dataInfo['owner_user_id']
+                );
+
+                $businessData = [];
+                $businessData['business_id'] = $dataInfo['business_id'];
+                $businessData['is_end'] = $dataInfo['submit_end_status'];
+                $businessData['status_id'] = $dataInfo['status_id'];
+                $businessData['statusRemark'] = $dataInfo['submit_remark'];
+
+                $result = $this->advanceAfterCheck($businessData);
+                if (!empty($result)) return $result;
+            } else {
+                if ($status) {
+                    //发送站内信
+                    // 通过未完成，发送消息给
+                    (new Message())->send(
+                        Message::BUSINESS_ADVANCE_CHECK_TO_DO,
+                        [
+                            'from_user' => User::where(['id' => $dataInfo['owner_user_id']])->value('realname'),
+                            'title' => $dataInfo['name'],
+                            'action_id' => $param['id']
+                        ],
+                        stringToArray($businessCheckData['check_user_id'])
+                    );
+                } else {
+                    (new Message())->send(
+                        Message::BUSINESS_ADVANCE_CHECK_REJECT,
+                        [
+                            'title' => $dataInfo['name'],
+                            'action_id' => $param['id']
+                        ],
+                        $dataInfo['owner_user_id']
+                    );
+                }
+            }
+            return resultArray(['success' => '审批成功']);
+        } else {
+            return resultArray(['error' => '审批失败，请重试！']);
+        }
+
+    }
+
+    /**
+     * 审核后商机状态推进
+     * @param business_id 商机ID
+     * @param status_id 推进商机状态ID
+     * @return
+     * @author Michael_xu
+     */
+    private function advanceAfterCheck($param)
+    {
        $userInfo = $this->userInfo;
        $userModel = new \app\admin\model\User();
-//        $is_end = $param['is_end'] ?: 0; //1赢单2输单3无效
-//        $remark = $param['statusRemark'];
-        $check_status = $param['check_status'];
+        $is_end = $param['is_end'] ?: 0; //1赢单2输单3无效
        if (!$param['business_id']) {
-            return resultArray(['error' => '参数错误']);
+            return ['error' => '参数错误'];
        }
-
-        if ($check_status == 2) {
        $businessInfo = db('crm_business')->where(['business_id' => $param['business_id']])->find();
-//        if ($businessInfo['is_end']) {
-//            return resultArray(['error' => '已结束，不能推进']);
-//        }
-
+        if ($businessInfo['is_end']) {
+            return ['error' => '已结束，不能推进'];
+        }
        //判断权限
        $auth_user_ids = $userModel->getUserByPer('crm', 'business', 'update');
        //读写权限
@ -597,25 +788,27 @@ class Business extends ApiCommon

        $status_id = $param['status_id'] ?: $businessInfo['status_id'];
        $statusInfo = db('crm_business_status')->where(['type_id' => $businessInfo['type_id'], 'status_id' => $status_id])->find();
-            if (!$statusInfo && $businessInfo['is_end']) {
-                return resultArray(['error' => '参数错误']);
+        if (!$statusInfo && !$is_end) {
+            return ['error' => '参数错误'];
        }
        $data = [];
        $data['update_time'] = time();
-//        $data['is_end'] = $is_end;
-//        $data['remark'] = $remark;
-            $data['check_status'] = $check_status;
+        $data['is_end'] = $is_end;
+//        if ($is_end) {
+//            $status_id = $is_end;
+//        }
        $data['status_id'] = $status_id;
        $data['status_time'] = time();
+        $data['remark'] = $param['submit_remark'];
        $res = db('crm_business')->where(['business_id' => $param['business_id']])->update($data);
        if (!$res) {
-                return resultArray(['error' => '推进失败，请重试']);
+            return ['error' => '推进失败，请重试'];
        } else {
            # 商机变更后的名称
            $businessStatusName = Db::name('crm_business_status')->where('status_id', $param['status_id'])->value('name');
-                if (empty($businessStatusName) && $businessInfo['is_end'] == 1) $businessStatusName = '赢单';
-                if (empty($businessStatusName) && $businessInfo['is_end'] == 2) $businessStatusName = '输单';
-                if (empty($businessStatusName) && $businessInfo['is_end'] == 3) $businessStatusName = '无效';
+            if (empty($businessStatusName) && $is_end == 1) $businessStatusName = '赢单';
+            if (empty($businessStatusName) && $is_end == 2) $businessStatusName = '输单';
+            if (empty($businessStatusName) && $is_end == 3) $businessStatusName = '无效';
            # 添加活动记录
            Db::name('crm_activity')->insert([
                'type' => 3,
@ -628,24 +821,9 @@ class Business extends ApiCommon
                'customer_ids' => ',' . $businessInfo['customer_id'] . ','
            ]);

-                # 删除待办事项的关联数据
-                db('crm_dealt_relation')->where(['types' => ['eq', 'crm_business'], 'types_id' => ['eq', $data['business_id']]])->delete();
-                # 创建待办事项的关联数据
-                $checkUserIds = db('crm_business')->where('business_id', $data['business_id'])->value('check_user_id');
-                $checkUserIdArray = stringToArray($checkUserIds);
-                $dealtData = [];
-                foreach ($checkUserIdArray AS $kk => $vv) {
-                    $dealtData[] = [
-                        'types'    => 'crm_business',
-                        'types_id' => $data['business_id'],
-                        'user_id'  => $vv
-                    ];
-                }
-                if (!empty($dealtData)) db('crm_dealt_relation')->insertAll($dealtData);
-
            //推进记录添加
            $temp['status_id'] = $status_id ?: 0;
-                $temp['is_end'] = $businessInfo['is_end'] ?: 0;
+            $temp['is_end'] = $is_end ?: 0;
            $temp['business_id'] = $param['business_id'];
            $temp['create_time'] = time();
            $temp['owner_user_id'] = $userInfo['id'];
@ -662,18 +840,7 @@ class Business extends ApiCommon
                'status_list' => $businessStatus
            ];

-                return resultArray(['data' => $result]);
-            }
-        } else {
-            $data = [];
-            $data['update_time'] = time();
-            $data['is_end'] = 0;
-            $data['remark'] = '';
-            $data['check_status'] = $check_status;
-            $res = db('crm_business')->where(['business_id' => $param['business_id']])->update($data);
-            if (!$res) {
-                return resultArray(['error' => '推进失败，请重试']);
-            }
+            return '';
        }
    }

--- a/application/crm/controller/Callback.php
+++ b/application/crm/controller/Callback.php
@ -9,9 +9,11 @@ namespace app\crm\controller;

 use app\common\wework\api\Api;
 use app\common\wework\callback\WXBizMsgCrypt;
+use think\Cache;
 use think\Controller;
 use think\Log;
 use think\Request;
+use think\Session;

 class Callback extends Controller
 {
@ -33,15 +35,43 @@ class Callback extends Controller
                switch ($simpleXMLElement->Event->__toString()) {
                    case 'change_external_contact':
                        $api = new Api(config('wework.corpId'), config('wework.corpSecret'));
-                        $contactInfo = $api->contactInfo('wm9nLQEAAA6lshIXRN5xdd1iZjqevSyA');
+                        $contactInfo = $api->contactInfo($simpleXMLElement->ExternalUserID->__toString());
                        foreach ($contactInfo['follow_user'] as $contactUserInfo) {
                            if ($contactUserInfo['userid'] == $simpleXMLElement->UserID->__toString()) {
                                $customerInfo = model('Customer')->where('name', $contactUserInfo['remark_corp_name'])->find();
                                if ($customerInfo) {
+                                    $wxwork = db('admin_wxwork')->where("user_id", $contactUserInfo['userid'])->find();
+                                    if (!$wxwork) {
+                                        $userGet = $api->userGet($contactUserInfo['userid']);
+                                        $wxwork = [
+                                            'user_id' => $userGet['userid'],
+                                            'name' => $userGet['name'],
+                                            'create_time' => time(),
+                                            'update_time' => time(),
+                                        ];
+                                        db('admin_wxwork')->insert($wxwork);
+                                        $wxwork = db('admin_wxwork')->where("user_id", $contactUserInfo['userid'])->find();
+                                        if (!$wxwork) {
+                                            Log::record('联系人添加失败');
+                                            return;
+                                        }
+                                    }
+                                    if ($wxwork['update_time']+86400*3 < time()) {
+                                        db('admin_wxwork')->where("id", $wxwork['id'])->update([
+                                            'name' => $userGet['name'],
+                                            'update_time' => time(),
+                                        ]);
+                                    }
+
                                    $contactsInfo = model('Contacts')->where([
-                                        'name' => $contactUserInfo['remark'],
-                                        'customer_id' => $customerInfo['customer_id']
+                                        'external_userid' => $simpleXMLElement->ExternalUserID->__toString(),
+                                        'customer_id' => $customerInfo['customer_id'],
+                                        'wxwork_id' => $wxwork['id']
                                    ])->find();
+                                    $mobile = '';
+                                    if ($contactUserInfo['remark_mobiles']) {
+                                        $mobile = $contactUserInfo['remark_mobiles'][0];
+                                    }
                                    if (!$contactsInfo) {
                                        $param = [
                                            'business_id' => null,
@ -49,13 +79,22 @@ class Callback extends Controller
                                            'owner_user_id' => 1,
                                            'customer_id' => $customerInfo['customer_id'],
                                            'name' => $contactUserInfo['remark'],
-                                            'mobile' => $contactUserInfo['remark_mobiles'][0],
+                                            'mobile' => $mobile,
+                                            'external_userid' => $simpleXMLElement->ExternalUserID->__toString(),
+                                            'wxwork_id' => $wxwork['id']
                                        ];
                                        if (model('Contacts')->createData($param)) {
                                            Log::record('联系人添加成功');
                                        } else {
                                            Log::record('联系人添加失败');
                                        }
+                                    } else {
+                                        $param = [
+                                            'name' => $contactUserInfo['remark'],
+                                            'mobile' => $mobile
+                                        ];
+                                        model('Contacts')->where('contacts_id', $contactsInfo['contacts_id'])->update($param);
+                                        Log::record('联系人更新成功');
                                    }
                                }
                            }
@ -83,4 +122,43 @@ class Callback extends Controller
            }
        }
    }
+
+    public function work() {
+        $code = Request::instance()->get('code');
+        $api = new Api(config('wework.corpId'), config('wework.corpSecret'));
+        $userInfo = $api->getUserInfo($code);
+        Log::record('用户信息'.json_encode($userInfo));
+        if (isset($userInfo['userid']) && $userInfo['userid']) {
+            Session::set('wxuser_id', $userInfo['userid']);
+            $adminUser = db('admin_user')->where('wxwork_id', $userInfo['userid'])->find();
+            if($adminUser['status']==1){
+                if ($adminUser) {
+                    Session::set('user_id', $adminUser['id']);
+
+                    $info['userInfo'] = $adminUser;
+                    $info['sessionId'] = session_id();
+                    // $info['_AUTH_LIST_'] = $dataList['rulesList'];
+                    $info['authKey'] = 'wxwork';
+                    if (!Cache::get('Auth_wxwork')) {
+                        Cache::set('Auth_wxwork', $info);
+                    }
+                    return redirect('http://web.lbschem.com:8088/?authkey=wxwork&sessionid='.session_id());
+                } elseif (Session::get('user_id')) {
+                    db('admin_user')->where('id', Session::get('user_id'))->update([
+                        'wxwork_id' => $userInfo['userid']
+                    ]);
+                    $adminUser = db('admin_user')->where('id', Session::get('user_id'))->find();
+                    $info['userInfo'] = $adminUser;
+                    $info['sessionId'] = session_id();
+                    // $info['_AUTH_LIST_'] = $dataList['rulesList'];
+                    $info['authKey'] = 'wxwork';
+                    if (!Cache::get('Auth_wxwork')) {
+                        Cache::set('Auth_wxwork', $info);
+                    }
+                    return redirect('http://web.lbschem.com:8088/?authkey=wxwork&sessionid='.session_id());
+                }
+            }
+        }
+        return redirect('http://web.lbschem.com:8088/');
+    }
 }
--- a/application/crm/controller/Customer.php
+++ b/application/crm/controller/Customer.php
@ -31,7 +31,7 @@ class Customer extends ApiCommon
    {
        $action = [
            'permission' => ['exceldownload', 'setfollow', 'delete'],
-            'allow' => ['read', 'system', 'count', 'poolauthority', 'level']
+            'allow' => ['read', 'system', 'count', 'poolauthority', 'level','type']
        ];
        Hook::listen('check_auth', $action);
        $request = Request::instance();
@ -123,6 +123,14 @@ class Customer extends ApiCommon
            $authData['dataAuth'] = (int)0;
            return resultArray(['data' => $authData]);
        }
+        // 判断是否有客户捞取审批
+        $customerCheck = db('crm_customer_check')->where(['customer_id' => $param['id']])->where(['check_status' => 0])->find();
+        if (!empty($customerCheck)) {
+            $data['flow_id'] = $customerCheck['flow_id'];
+            $data['owner_user_id'] = $customerCheck['user_id'];
+            $data['customer_check_id'] = $customerCheck['customer_check_id'];
+            $data['apply_user_name'] = db('admin_user')->where('id', $customerCheck['create_user_id'])->column("username");
+        }
        return resultArray(['data' => $data]);
    }

@ -415,13 +423,25 @@ class Customer extends ApiCommon
        # 消息数据
        $message = [];

+        # 获取公海规则数据
+        $customerPoolData = db('crm_customer_pool')->where('pool_id=' . $poolId)->column(['customer_type']);
+        $customerTypeArray = explode(',', $customerPoolData[0]);
+
        # 获取客户数据
        $customerData = [];
-        $customerList = db('crm_customer')->field(['customer_id', 'owner_user_id', 'name'])->whereIn('customer_id', $customerIds)->select();
+        $customerList = db('crm_customer')->field(['customer_id', 'owner_user_id', 'name', 'crm_lthugd'])->whereIn('customer_id', $customerIds)->select();
+
+
        foreach ($customerList as $key => $value) {
+            # 判断客户类型是否符合公海池客户类型
+            if (!in_array($value['crm_lthugd'], $customerTypeArray)) {
+                $message[] = '客户类型与公海池类型不匹配！';
+                return resultArray(['error' => $message]);
+            }
            $customerData[$value['customer_id']] = $value;
        }

+
        # 整理数据
        $ip = request()->ip();
        $poolRelationData = [];
@ -1167,4 +1187,20 @@ class Customer extends ApiCommon

        return resultArray(['data' => $data]);
    }
+
+    /**
+     * 客户类型列表
+     *
+     * @return \think\response\Json
+     * @since 2021-03-29
+     * @author fanqi
+     */
+    public function type()
+    {
+        $data = db('admin_field')->where(['types' => 'crm_customer', 'field' => 'crm_lthugd'])->value('options');
+
+        $data = explode(',', $data);
+
+        return resultArray(['data' => $data]);
+    }
 }
--- a/application/crm/controller/CustomerPool.php
+++ b/application/crm/controller/CustomerPool.php
@ -43,7 +43,8 @@ class CustomerPool extends ApiCommon
                'setfieldconfig',
                'exceldownload',
                'import',
-                'export'
+                'export',
+                'checkCustomerReveive'
            ]
        ];
        Hook::listen('check_auth', $action);
@ -423,11 +424,11 @@ class CustomerPool extends ApiCommon
        $customerCheckData['update_time'] = time();
        $customerCheckData['check_status'] = 1; //0待审核，1审核通中，2审核通过，3审核未通过
        //权限判断
-        if (!$examineStepModel->checkExamine($user_id, 'crm_contract', $param['id'])) {
+        if (!$examineStepModel->checkExamine($user_id, 'crm_customer_check', $param['id'])) {
            return resultArray(['error' => $examineStepModel->getError()]);
        }
        //审批主体详情
-        $dataInfo = db('crm_customer_check')->where('customer_check_id', 'in', $param['customer_check_id'])->find();
+        $dataInfo = db('crm_customer_check')->where('customer_check_id', 'in', $param['id'])->find();
        $flowInfo = $examineFlowModel->getDataById($dataInfo['flow_id']);
        $is_end = 0; // 1审批结束

@ -489,7 +490,7 @@ class CustomerPool extends ApiCommon
            if ($is_end == 1 && !empty($status)) {
                // 审批通过消息告知负责人
                (new Message())->send(
-                    Message::CONTRACT_PASS,
+                    Message::CUSTOMER_CHECK_PASS,
                    [
                        'title' => $dataInfo['name'],
                        'action_id' => $param['id']
@ -535,4 +536,20 @@ class CustomerPool extends ApiCommon
            return resultArray(['error' => '审批失败，请重试！']);
        }
    }
+
+    /**
+     * 总经理公海池消息提醒
+     *
+     * @return Json
+     * @since 2021-04-14
+     * @author fanqi
+     */
+    public function num()
+    {
+
+        $customerPoolCount = db('crm_customer_pool_relation')->where("pool_id",array('eq',3))
+            ->count();
+
+        return resultArray(['data' => $customerPoolCount]);
+    }
 }
--- a/application/crm/controller/Index.php
+++ b/application/crm/controller/Index.php
@ -219,6 +219,16 @@ class Index extends ApiCommon
            $param['end_time'] = $param['end_time'] . ' 23:59:59';
        }
        $list = $businessModel->getFunnel($param);
+        $list['list'][] = [
+            "name" => "赢单",
+            "status_id" => "10000",
+            "status_name" => "赢单",
+        ];
+        $list['list'][] = [
+            "name" => "输单",
+            "status_id" => "10001",
+            "status_name" => "输单",
+        ];
        return resultArray(['data' => $list]);
    }

@ -702,7 +712,11 @@ class Index extends ApiCommon
        $userInfo = $this->userInfo;
        $param['user_id'] = $param['user_id'] ?: $userInfo['id'];
        $indexModel = new IndexLogic;
+        if ($param['status_id'] == "10000" || $param['status_id'] == "10001") {
+            $param['funnel'] = $param['status_id'];
+        }
        $data = $indexModel->businessList($param);
+
        return resultArray(['data' => $data]);
    }

@ -754,7 +768,8 @@ class Index extends ApiCommon
     * 跟进详情
     * @return \think\response\Json
     */
-    public function activityList(){
+    public function activityList()
+    {
        $param = $this->param;
        $userInfo = $this->userInfo;
        $param['id'] = $userInfo['id'];
--- a/application/crm/controller/Message.php
+++ b/application/crm/controller/Message.php
@ -42,7 +42,10 @@ class Message extends ApiCommon
                'remindcustomer',
                'checkinvoice',
                'visitcontract',
-                'alldeal'
+                'alldeal',
+                'checkBusiness',
+                'newBusiness',
+                'checkCustomerCheck',
            ]
        ];
        Hook::listen('check_auth', $action);
@ -606,12 +609,13 @@ class Message extends ApiCommon
        unset($param['type']);
        unset($param['isSub']);
        $businessModel = model('Business');
-        $param['owner_user_id'] = $userInfo['id'];
+//        $param['owner_user_id'] = $userInfo['id'];
        if ($isSub) {
            $param['owner_user_id'] = array('in', getSubUserId(false));
        }
+        $businessIdArray = db('crm_dealt_relation')->where(['types' => ['eq', 'crm_business_new'], 'user_id' => ['eq', $userInfo['id']]])->column('types_id');
+        $param['businessIdArray'] = !empty($businessIdArray) ? $businessIdArray : -1;
        $data = $businessModel->getDataList($param);
-//        p($contractModel->getLastSql());
        if ($types == 'list') {
            return resultArray(['data' => $data]);
        }
@ -771,7 +775,7 @@ class Message extends ApiCommon
        }

        # 处理待审核合同、回款、发票
-        if (in_array($type, ['checkContract', 'checkReceivables', 'checkInvoice','checkBusiness'])) {
+        if (in_array($type, ['checkContract', 'checkReceivables', 'checkInvoice', 'checkBusiness', 'checkCustomerCheck', 'newBusiness'])) {
            $where['check_status'] = ['lt', '2'];
            $where['check_user_id'] = ['like', ',%' . $userId . '%,'];

@ -792,8 +796,19 @@ class Message extends ApiCommon
            }
            # 商机
            if ($type == 'checkBusiness') {
-                $invoiceId = !empty($typeId) ? $typeId : Db::name('crm_business')->where($where)->column('business_id');
-                db('crm_dealt_relation')->where('user_id', $userId)->where('types', 'crm_business')->whereIn('types_id', $invoiceId)->delete();
+                $businessId = !empty($typeId) ? $typeId : Db::name('crm_business')->where($where)->column('business_id');
+                db('crm_dealt_relation')->where('user_id', $userId)->where('types', 'crm_business')->whereIn('types_id', $businessId)->delete();
+            }
+            # 客户捞取
+            if ($type == 'checkCustomerCheck') {
+                $customerCheckId = !empty($typeId) ? $typeId : Db::name('crm_customer_check')->where($where)->column('customer_check_id');
+                db('crm_dealt_relation')->where('user_id', $userId)->where('types', 'crm_customer_check')->whereIn('types_id', $customerCheckId)->delete();
+            }
+
+            # 新商机
+            if ($type == 'newBusiness') {
+                $newBusinessId = !empty($typeId) ? $typeId : Db::name('crm_business')->where($where)->column('business_id');
+                db('crm_dealt_relation')->where('user_id', $userId)->where('types', 'crm_business_new')->whereIn('types_id', $newBusinessId)->delete();
            }

        }
@ -881,6 +896,9 @@ class Message extends ApiCommon
        cache::rm('visitContractCount' . $userId);
        cache::rm('endContractCount' . $userId);
        cache::rm('remindCustomerCount' . $userId);
+        cache::rm('checkCustomerCheckCount' . $userId);
+        cache::rm('checkBusinessCount' . $userId);
+        cache::rm('newBusinessCount' . $userId);

        cache::rm('todayLeadsTime' . $userId);
        cache::rm('todayCustomerTime' . $userId);
@ -895,6 +913,9 @@ class Message extends ApiCommon
        cache::rm('visitContractTime' . $userId);
        cache::rm('endContractTime' . $userId);
        cache::rm('remindCustomerTime' . $userId);
+        cache::rm('checkCustomerCheckTime' . $userId);
+        cache::rm('checkBusinessTime' . $userId);
+        cache::rm('newBusinessTime' . $userId);
        return resultArray(['data' => '操作成功！']);
    }
 }
--- a/application/crm/logic/CustomerPoolLogic.php
+++ b/application/crm/logic/CustomerPoolLogic.php
@ -447,9 +447,9 @@ class CustomerPoolLogic extends Common
     * 领取公海客户
     *
     * @param array $param user_id 领取人ID，customer_id 要领取的客户ID
-     * @author fanqi
-     * @since 2021-04-15
     * @return array
+     * @since 2021-04-15
+     * @author fanqi
     */
    public function receiveCustomers($param)
    {
@ -467,7 +467,7 @@ class CustomerPoolLogic extends Common
        $customerData = $this->getCustomerList($customerId);

        # 剔除非公海客户
-        foreach ($customerId AS $key => $value) {
+        foreach ($customerId as $key => $value) {
            if (!empty($customerData[$value]['owner_user_id'])) {
                $message[] = '客户《' . $customerData[$value]['name'] . '》领取失败，失败原因：不是公海客户！';

@ -487,7 +487,7 @@ class CustomerPoolLogic extends Common
        $failCustomer = [];
        if (!is_bool($exceedCount) && !empty($exceedCount) && $exceedCount > 0) {
            $failCustomer = array_slice($customerId, count($customerId) - $exceedCount);
-            foreach ($failCustomer AS $key => $value) {
+            foreach ($failCustomer as $key => $value) {
                $message[] = '客户《' . $customerData[$value]['name'] . '》领取失败，失败原因：持有客户数达到上限！';
            }
        }
@ -503,7 +503,7 @@ class CustomerPoolLogic extends Common

        # 前负责人N天内不能领取客户
        if (!empty($poolConfig['before_owner_conf'])) {
-            foreach ($addCustomerId AS $key => $value) {
+            foreach ($addCustomerId as $key => $value) {
                # 是前负责人，检查前负责人是否能够领取。
                if ($userId == $customerData[$value]['before_owner_user_id']) {
                    $restrictDay = $customerData[$value]['into_pool_time'] + 86400 * $poolConfig['before_owner_day'];
@ -536,7 +536,8 @@ class CustomerPoolLogic extends Common
            'owner_user_id' => $userId,
            'before_owner_user_id' => 0,
            'into_pool_time' => 0,
-            'obtain_time'          => time()
+            'obtain_time' => time(),
+            'is_allocation' => 1,
        ];

        # 整理字段操作记录和数据日志的数据
@ -544,7 +545,7 @@ class CustomerPoolLogic extends Common
        $addActionRecordData = [];
        $addOperationLogData = [];
        $addReceiveData = [];
-        foreach ($addCustomerId AS $key => $value) {
+        foreach ($addCustomerId as $key => $value) {
            $addActionRecordData[] = [
                'user_id' => $userId,
                'types' => 'crm_customer',
@ -1139,12 +1140,12 @@ class CustomerPoolLogic extends Common
        $customerCheckModel = model('CustomerCheck');
        $examineStepModel = new \app\admin\model\ExamineStep();
        $examineStatus = $param['examineStatus'] ?? 1; // 审批是否停用
-        $param['check_user_id'] =1 ;// 临时测试需删除
        unset($param['examineStatus']);


        $dataInfo = db('crm_customer_check')->where('customer_id', 'in', $param['customer_id'])->find();
-        if ($dataInfo) {
+
+        if (!empty($dataInfo)&& $dataInfo['check_status'] < 2) {
            return '客户已被领取待审批，请联系管理员';
        }

--- a/application/crm/logic/MessageLogic.php
+++ b/application/crm/logic/MessageLogic.php
@ -282,8 +282,8 @@ class MessageLogic extends Common
                    $param['check_status']  = ['lt', 2];
                    $param['check_user_id'] = ['like', '%,'. $param['user_id'] .',%'];
                    # 要提醒的商机ID
-                    $businessIdArray = db('crm_dealt_relation')->where(['types' => ['eq', 'crm_customer_check'], 'user_id' => ['eq', $param['user_id']]])->column('types_id');
-                    $param['businessIdArray'] = !empty($businessIdArray) ? $businessIdArray : -1;
+                    $customerCheckIdArray = db('crm_dealt_relation')->where(['types' => ['eq', 'crm_customer_check'], 'user_id' => ['eq', $param['user_id']]])->column('types_id');
+                    $param['customerCheckIdArray'] = !empty($customerCheckIdArray) ? $customerCheckIdArray : -1;
                    break;
                case '2' :
                    # 全部
--- a/application/crm/model/Business.php
+++ b/application/crm/model/Business.php
@ -6,6 +6,7 @@
 // +----------------------------------------------------------------------
 namespace app\crm\model;

+use app\admin\model\Message;
 use app\admin\traits\FieldVerificationTrait;
 use think\Db;
 use app\admin\model\Common;
@ -51,6 +52,7 @@ class Business extends Common
        $overdue = $request['overdue']; // 待办事项下需联系商机(逾期)
        $businessIdArray = $request['businessIdArray']; // 待办事项提醒参数
        $isMessage = !empty($request['isMessage']);
+        $funnelQuery = $request['funnel']; // 销售漏斗查询赢单输单
        unset($request['scene_id']);
        unset($request['search']);
        unset($request['user_id']);
@ -64,6 +66,7 @@ class Business extends Common
        unset($request['overdue']);
        unset($request['isMessage']);
        unset($request['businessIdArray']);
+        unset($request['funnel']);
        $request = $this->fmtRequest($request);
        $requestMap = $request['map'] ?: [];
        $sceneModel = new \app\admin\model\Scene();
@ -141,6 +144,18 @@ class Business extends Common
                };
            }
        }
+        // 销售漏斗处理
+        if (!empty($funnelQuery)){
+            unset($map['business.status_id']);
+            unset($map['business.is_end']);
+            switch ($funnelQuery){
+                case '10000':// 赢单
+                    $map['business.is_end']=1;
+                    break;
+                case "10001":// 输单
+                    $map['business.is_end']=2;
+            }
+        }

        //联系人商机
        if ($contacts_id) {
@ -393,7 +408,6 @@ class Business extends Common
                }
            }
        }
-
        # 设置今日需联系商机
        if (!empty($param['next_time']) && $param['next_time'] >= strtotime(date('Y-m-d 00:00:00'))) $param['is_dealt'] = 0;

@ -437,6 +451,31 @@ class Business extends Common
            });
            db('crm_business_data')->insertAll($businessData);

+            //站内信
+            $userInfo = db('admin_user')->where(['id' => $param['create_user_id']])->find();
+            $send_user_id = stringToArray(getUserSuperior($userInfo['structure_id'], 0));
+            (new Message())->send(
+                Message::CUSTOMER_CHECK_TO_DO,
+                [
+                    'title' => $param['name'],
+                    'action_id' => $this->business_id
+                ],
+                $send_user_id
+            );
+
+            $data = [];
+            $data['business_id'] = $this->business_id;
+            # 创建待办事项的关联数据
+            $dealtData = [];
+            foreach ($send_user_id as $kk => $vv) {
+                $dealtData[] = [
+                    'types' => 'crm_business_new',
+                    'types_id' => $data['business_id'],
+                    'user_id' => $vv
+                ];
+            }
+            if (!empty($dealtData)) db('crm_dealt_relation')->insertAll($dealtData);
+
            return $data;
        } else {
            $this->error = '添加失败';
--- a/application/crm/model/Contacts.php
+++ b/application/crm/model/Contacts.php
@ -206,6 +206,11 @@ class Contacts extends Common
            $list[$k]['owner_user_id_info'] = isset($v['owner_user_id']) ? $userModel->getUserById($v['owner_user_id']) : [];
            $list[$k]['customer_id_info']['customer_id'] = $v['customer_id'] ?: '';
            $list[$k]['customer_id_info']['name'] = $v['customer_name'] ?: '';
+            $list[$k]['wxwork_name'] = '';
+            if ($list[$k]['wxwork_id']) {
+                $wxwork = db('admin_wxwork')->where('id', $list[$k]['wxwork_id'])->find();
+                $list[$k]['wxwork_name'] = $wxwork['name'];
+            }
            foreach ($userField as $key => $val) {
                $usernameField = !empty($v[$val]) ? db('admin_user')->whereIn('id', stringToArray($v[$val]))->column('realname') : [];
                $list[$k][$val] = implode($usernameField, ',');
--- a/application/crm/model/Customer.php
+++ b/application/crm/model/Customer.php
@ -39,11 +39,11 @@ class Customer extends Common

    /**
     * [getDataList 客户list]
-     * @author Michael_xu
     * @param     [string]                   $map [查询条件]
     * @param     [number]                   $page     [当前页数]
     * @param     [number]                   $limit    [每页数量]
     * @return    [array]                    [description]
+     * @author Michael_xu
     */
    public function getDataList($request)
    {
@ -156,7 +156,14 @@ class Customer extends Common
            };
        }

-
+        // 过滤角色
+        $groupIds = db('admin_access')->where("user_id", array("eq", $user_id))->column("group_id");
+        if (!in_array(1,$groupIds)){
+            $groupNameArray = db('admin_group')->where("pid", array("eq", 2))->where("id", array("in", $groupIds))->column("title");
+            if ($groupNameArray){
+                $map['customer.crm_lthugd'] = array('in', $groupNameArray);
+            }
+        }

        # 代办事项 - 待进入公海
        $remindWhere = [];
@ -250,7 +257,7 @@ class Customer extends Common
            # 处理数据
            $list = getFieldData($list, 'crm_customer', $user_id);
            # 整理数据
-			foreach ($list AS $k => $v) {
+            foreach ($list as $k => $v) {

                $list[$k]['create_user_id_info'] = isset($v['create_user_id']) ? $userModel->getUserById($v['create_user_id']) : [];
                $list[$k]['owner_user_id_info'] = isset($v['owner_user_id']) ? $userModel->getUserById($v['owner_user_id']) : [];
@ -294,16 +301,16 @@ class Customer extends Common
            }
        }
        $data = [];
-        $data['list'] = $list ? : [];
        $data['dataCount'] = $dataCount ?: 0;
+        $data['list'] = $list ?: [];
        return $data;
    }

    /**
     * 创建客户主表信息
-	 * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function createData($param)
    {
@ -363,7 +370,7 @@ class Customer extends Common
        // 处理日期（date）类型
        $dateField = $fieldModel->getFieldByFormType('crm_customer', 'date');
        if (!empty($dateField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                if (in_array($key, $dateField) && empty($value)) $param[$key] = null;
            }
        }
@ -371,7 +378,7 @@ class Customer extends Common
        // 处理手写签名类型
        $handwritingField = $fieldModel->getFieldByFormType('crm_customer', 'handwriting_sign');
        if (!empty($handwritingField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                if (in_array($key, $handwritingField)) {
                    $param[$key] = !empty($value['file_id']) ? $value['file_id'] : '';
                }
@ -384,7 +391,7 @@ class Customer extends Common
        $dateIntervalField = $fieldModel->getFieldByFormType('crm_customer', 'date_interval');
        $detailTableField = $fieldModel->getFieldByFormType('crm_customer', 'detail_table');
        $dateField = $fieldModel->getFieldByFormType('crm_customer', 'date');
-        foreach ($param AS $key => $value) {
+        foreach ($param as $key => $value) {
            // 处理地址类型字段数据
            if (in_array($key, $positionField)) {
                if (!empty($value) && is_array($value)) {
@ -517,9 +524,9 @@ class Customer extends Common

    /**
     * 编辑客户主表信息
-	 * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function updateDataById($param, $customer_id = '')
    {
@ -582,7 +589,7 @@ class Customer extends Common
        // 处理日期（date）类型
        $dateField = $fieldModel->getFieldByFormType('crm_customer', 'date');
        if (!empty($dateField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                if (in_array($key, $dateField) && empty($value)) $param[$key] = null;
            }
        }
@ -590,7 +597,7 @@ class Customer extends Common
        // 处理手写签名类型
        $handwritingField = $fieldModel->getFieldByFormType('crm_customer', 'handwriting_sign');
        if (!empty($handwritingField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                if (in_array($key, $handwritingField)) {
                    $param[$key] = !empty($value['file_id']) ? $value['file_id'] : '';
                }
@ -602,7 +609,7 @@ class Customer extends Common
        $locationField = $fieldModel->getFieldByFormType('crm_customer', 'location');
        $dateIntervalField = $fieldModel->getFieldByFormType('crm_customer', 'date_interval');
        $detailTableField = $fieldModel->getFieldByFormType('crm_customer', 'detail_table');
-        foreach ($param AS $key => $value) {
+        foreach ($param as $key => $value) {
            // 处理地址类型字段数据
            if (in_array($key, $positionField)) {
                if (!empty($value)) {
@ -714,7 +721,7 @@ class Customer extends Common
                    }
                }
            }
-            foreach ($fieldGrant AS $key => $val){
+            foreach ($fieldGrant as $key => $val) {
                //掩码相关类型字段
                if ($val['maskType'] != 0 && $val['form_type'] == 'mobile') {
                    $pattern = "/(1[3458]{1}[0-9])[0-9]{4}([0-9]{4})/i";
@ -762,7 +769,7 @@ class Customer extends Common
        if (!empty($userId)) {
            $grantData = getFieldGrantData($userId);
            $userLevel = isSuperAdministrators($userId);
-            foreach ($dataInfo AS $key => $value) {
+            foreach ($dataInfo as $key => $value) {
                if (!$userLevel && !empty($grantData['crm_customer'])) {
                    $status = getFieldGrantStatus($key, $grantData['crm_customer']);

@ -782,9 +789,9 @@ class Customer extends Common

    /**
     * [客户统计]
-     * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function getStatistics($request)
    {
@ -900,9 +907,9 @@ class Customer extends Common

    /**
     * [客户数量]
-     * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function getDataCount($map)
    {
@ -914,9 +921,9 @@ class Customer extends Common
    /**
     * 客户默认条件
     *
-     * @author fanqi
-     * @since 2021-05-12
     * @return array
+     * @since 2021-05-12
+     * @author fanqi
     */
    public function getWhereByCustomer()
    {
@ -926,9 +933,9 @@ class Customer extends Common
    /**
     * 客户公海条件
     *
-     * @author fanqi
-     * @since 2021-05-12
     * @return array
+     * @since 2021-05-12
+     * @author fanqi
     */
    public function getWhereByPool()
    {
@ -937,9 +944,9 @@ class Customer extends Common

    /**
     * 客户权限判断(是否客户公海)
-     * @author Michael_xu
     * @param type 1 是公海返回false,默认是公海返回true
     * @return
+     * @author Michael_xu
     */
    public function checkData($customer_id, $type = '')
    {
@ -966,9 +973,9 @@ class Customer extends Common
     * 客户到期天数
     *
     * @param array $customerIds 客户ID
-     * @author fanqi
-     * @since 2021-04-19
     * @return array
+     * @since 2021-04-19
+     * @author fanqi
     */
    public function getPoolDay($customerIds = [], $userIds = [])
    {
@ -976,13 +983,13 @@ class Customer extends Common

        $where['pool.status'] = 1;      # 公海开启
        $where['pool.remind_conf'] = 1; # 提醒开启
-        $poolRules = db('crm_customer_pool_rule')->alias('rule')->field(['rule.*', 'pool.remain_day'])->join('__CRM_CUSTOMER_POOL__ pool', 'rule.pool_id = pool.pool_id', 'LEFT')->where($where)->select();
+        $poolRules = db('crm_customer_pool_rule')->alias('rule')->field(['rule.*', 'pool.remain_day'])->join('__CRM_CUSTOMER_POOL__ pool', 'rule.pool_id = pool.pool_id', 'LEFT')->field("pool.customer_type")->where($where)->select();

        if (!empty($poolRules)) {
-            foreach ($poolRules AS $key => $value) {
-                if ($value['type'] == 1) $result[] = $this->getFollowUpQueryResult($value['level_conf'], $value['level'], $value['deal_handle'], $value['business_handle'], $value['remain_day'], $customerIds, $userIds);
-                if ($value['type'] == 2) $result[] = $this->getBusinessQueryResult($value['level_conf'], $value['level'], $value['deal_handle'], $value['remain_day'], $customerIds, $userIds);
-                if ($value['type'] == 3) $result[] = $this->getDealQueryResult($value['level_conf'], $value['level'], $value['business_handle'], $value['remain_day'], $customerIds, $userIds);
+            foreach ($poolRules as $key => $value) {
+                if ($value['type'] == 1) $result[] = $this->getFollowUpQueryResult($value['level_conf'], $value['level'], $value['deal_handle'], $value['business_handle'],$value['customer_type'], $value['remain_day'], $customerIds, $userIds);
+                if ($value['type'] == 2) $result[] = $this->getBusinessQueryResult($value['level_conf'], $value['level'], $value['deal_handle'],$value['customer_type'], $value['remain_day'], $customerIds, $userIds);
+                if ($value['type'] == 3) $result[] = $this->getDealQueryResult($value['level_conf'], $value['level'], $value['business_handle'], $value['customer_type'],$value['remain_day'], $customerIds, $userIds);
            }
        }
        
@ -993,9 +1000,9 @@ class Customer extends Common
     * 获取每个客户最快进入公海天数
     *
     * @param $data
-     * @author fanqi
-     * @since 2021-04-19
     * @return array
+     * @since 2021-04-19
+     * @author fanqi
     */
    private function getMinIntoPoolDay($data)
    {
@ -1003,16 +1010,16 @@ class Customer extends Common
        $temporary = [];

        # 整理数据
-        foreach ($data AS $k1 => $v1) {
+        foreach ($data as $k1 => $v1) {
            if (empty($v1)) continue;

-            foreach ($v1 AS $k2 => $v2) {
+            foreach ($v1 as $k2 => $v2) {
                $temporary[$k2][] = $v2;
            }
        }

        # 每个客户最快进入公海天数
-        foreach ($temporary AS $k1 => $v1) {
+        foreach ($temporary as $k1 => $v1) {
            $result[$k1] = min($v1);
        }

@ -1023,15 +1030,15 @@ class Customer extends Common
     * 获取公海规则最小数字（最快进入公海天数）
     *
     * @param $data
-     * @author fanqi
-     * @since 2021-04-19
     * @return int
+     * @since 2021-04-19
+     * @author fanqi
     */
    private function getMinDay($data)
    {
        $number = 1;

-        foreach ($data AS $k1 => $v1) {
+        foreach ($data as $k1 => $v1) {
            if (empty($number) || $v1['limit_day'] < $number) $number = $v1['limit_day'];
        }

@ -1048,11 +1055,11 @@ class Customer extends Common
     * @param int $remainDay 提前几天提醒
     * @param array $customerIds 客户ID
     * @param array $userIds 员工ID
+     * @return array
     * @author fanqi
     * @since 2021-04-01
-     * @return array
     */
-    private function getFollowUpQueryResult($type, $levels, $dealStatus, $businessStatus, $remainDay, $customerIds = [], $userIds = [])
+    private function getFollowUpQueryResult($type, $levels, $dealStatus, $businessStatus,$customerType, $remainDay, $customerIds = [], $userIds = [])
    {
        # 结果数据
        $result = [];
@ -1072,7 +1079,7 @@ class Customer extends Common

        # 所有用户，不区分级别
        if ($type == 1) {
-            foreach ($levels AS $k1 => $v1) {
+            foreach ($levels as $k1 => $v1) {
                if (!empty($v1['limit_day'])) {
                    $time = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $v1['limit_day']));
                    $where .= " AND ((`customer`.`last_time` > " . $time . " AND `customer`.`last_time` > `customer`.`obtain_time`) OR (`customer`.`obtain_time` > " . $time . " AND `customer`.`obtain_time` > `customer`.`last_time`)  OR (`customer`.`obtain_time` > " . $time . " AND ISNULL(`customer`.`last_time`)))";
@ -1084,7 +1091,7 @@ class Customer extends Common

        # 根据用户级别设置条件
        if ($type == 2) {
-            foreach ($levels AS $k1 => $v1) {
+            foreach ($levels as $k1 => $v1) {
                if (!empty($v1['level']) && !empty($v1['limit_day'])) {
                    $time = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $v1['limit_day']));
                    if ($k1 == 0) {
@ -1101,7 +1108,7 @@ class Customer extends Common
            $minLimit = $this->getMinDay($levels);
            $minTime = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $minLimit));

-            $where .= " OR ((!`customer`.`level` AND `customer`.`last_time` > ".$minTime." AND `customer`.`last_time` > `customer`.`obtain_time`) OR (!`customer`.`level` AND `customer`.`obtain_time` > ".$time." AND `customer`.`obtain_time` > `customer`.`last_time`) OR (!`customer`.`level` AND `customer`.`obtain_time` > ".$minTime." AND ISNULL(`customer`.`last_time`))) )";
+            $where .= " OR ((ISNULL(`customer`.`level`) AND `customer`.`last_time` > " . $minTime . " AND `customer`.`last_time` > `customer`.`obtain_time`) OR (ISNULL(`customer`.`level`) AND `customer`.`obtain_time` > " . $time . " AND `customer`.`obtain_time` > `customer`.`last_time`) OR (ISNULL(`customer`.`level`) AND `customer`.`obtain_time` > " . $minTime . " AND ISNULL(`customer`.`last_time`))) )";
        }

        # 选择不进入公海的客户（已成交客户）
@ -1123,10 +1130,10 @@ class Customer extends Common
        $data = db('crm_customer')->alias('customer')
            ->field(['customer.customer_id', 'customer.obtain_time', 'customer.level', 'customer.last_time'])
            ->join('__CRM_BUSINESS__ business', 'business.customer_id = customer.customer_id', 'LEFT')
-            ->where($where)->select();
+            ->where($where)->where(['customer.crm_lthugd' => array('in', $customerType)])->select();

        # 计算到期天数
-        foreach ($data AS $k1 => $v1) {
+        foreach ($data as $k1 => $v1) {
            if ($type == 1) {
                $customerTime = !empty($v1['last_time']) && $v1['last_time'] > $v1['obtain_time'] ? $v1['last_time'] : $v1['obtain_time'];
                $date = date('Y-m-d 00:00:00', ($customerTime + $limitDay['all'] * 86400) - $remainDay * 86400);
@ -1160,11 +1167,11 @@ class Customer extends Common
     * @param int $remainDay 提前几天提醒
     * @param array $customerIds 客户ID
     * @param array $userIds 员工ID
-     * @author fanqi
-     * @since 2021-04-01
     * @return array|false|string
+     * @since 2021-04-01
+     * @author fanqi
     */
-    private function getBusinessQueryResult($type, $levels, $dealStatus, $remainDay, $customerIds = [], $userIds = [])
+    private function getBusinessQueryResult($type, $levels, $dealStatus,$customerType, $remainDay, $customerIds = [], $userIds = [])
    {
        # 结果数据
        $result = [];
@ -1184,7 +1191,7 @@ class Customer extends Common

        # 所有用户，不区分级别
        if ($type == 1) {
-            foreach ($levels AS $k1 => $v1) {
+            foreach ($levels as $k1 => $v1) {
                if (!empty($v1['limit_day'])) {
                    $time = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $v1['limit_day']));
                    $where .= " AND ( (ISNULL(`business`.`customer_id`) AND `customer`.`obtain_time` > " . $time . ") OR (`customer`.`obtain_time` > " . $time . " AND `customer`.`obtain_time` > `business`.`create_time`) OR (`business`.`create_time` > " . $time . " AND `business`.`create_time` > `customer`.`obtain_time`) )";
@ -1196,7 +1203,7 @@ class Customer extends Common

        # 根据用户级别设置条件
        if ($type == 2) {
-            foreach ($levels AS $k1 => $v1) {
+            foreach ($levels as $k1 => $v1) {
                if (!empty($v1['level']) && !empty($v1['limit_day'])) {
                    $time = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $v1['limit_day']));
                    if ($k1 == 0) {
@ -1213,7 +1220,7 @@ class Customer extends Common
            $minLimit = $this->getMinDay($levels);
            $minTime = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $minLimit));

-            $where .= " OR ((ISNULL(`business`.`customer_id`) AND `customer`.`obtain_time` > ".$minTime." AND !`customer`.`level`) OR (`customer`.`obtain_time` > ".$minTime." AND `customer`.`obtain_time` > `business`.`create_time` AND !`customer`.`level`) OR (`business`.`create_time` > ".$minTime." AND `business`.`create_time` > `customer`.`obtain_time` AND !`customer`.`level`)) )";
+            $where .= " OR ((ISNULL(`business`.`customer_id`) AND `customer`.`obtain_time` > " . $minTime . " AND ISNULL(`customer`.`level`)) OR (`customer`.`obtain_time` > " . $minTime . " AND `customer`.`obtain_time` > `business`.`create_time` AND ISNULL(`customer`.`level`)) OR (`business`.`create_time` > " . $minTime . " AND `business`.`create_time` > `customer`.`obtain_time` AND ISNULL(`customer`.`level`))) )";
        }

        # 选择不进入公海的客户（已成交客户）
@ -1232,10 +1239,10 @@ class Customer extends Common
        $data = db('crm_customer')->alias('customer')
            ->field(['customer.customer_id', 'customer.obtain_time AS customer_time', 'customer.level', 'business.create_time AS business_time'])
            ->join('__CRM_BUSINESS__ business', 'business.customer_id = customer.customer_id', 'LEFT')
-            ->where($where)->select();
+            ->where($where)->where(['customer.crm_lthugd' => array('in', $customerType)])->select();

        # 计算到期天数
-        foreach ($data AS $k1 => $v1) {
+        foreach ($data as $k1 => $v1) {
            if ($type == 1) {
                $customerTime = !empty($v1['business_time']) && $v1['business_time'] > $v1['customer_time'] ? $v1['business_time'] : $v1['customer_time'];
                $date = date('Y-m-d 00:00:00', ($customerTime + $limitDay['all'] * 86400) - $remainDay * 86400);
@ -1269,11 +1276,11 @@ class Customer extends Common
     * @param int $remainDay 提前几天提醒
     * @param array $customerIds 客户ID
     * @param array $userIds 员工ID
-     * @author fanqi
-     * @since 2021-04-01
     * @return array|false|string
+     * @since 2021-04-01
+     * @author fanqi
     */
-    private function getDealQueryResult($type, $levels, $businessStatus, $remainDay, $customerIds = [], $userIds = [])
+    private function getDealQueryResult($type, $levels, $businessStatus,$customerType, $remainDay, $customerIds = [], $userIds = [])
    {
        # 结果数据
        $result = [];
@ -1293,7 +1300,7 @@ class Customer extends Common

        # 所有用户，不区分级别
        if ($type == 1) {
-            foreach ($levels AS $k1 => $v1) {
+            foreach ($levels as $k1 => $v1) {
                if (!empty($v1['limit_day'])) {
                    $time = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $v1['limit_day']));
                    $where .= " AND ( (ISNULL(`contract`.`customer_id`) AND `customer`.`obtain_time` > " . $time . ") OR (`customer`.`obtain_time` > " . $time . " AND `customer`.`obtain_time` > `contract`.`create_time`) OR (`contract`.`create_time` > " . $time . " AND `contract`.`create_time` > `customer`.`obtain_time`) )";
@ -1305,7 +1312,7 @@ class Customer extends Common

        # 根据用户级别设置条件
        if ($type == 2) {
-            foreach ($levels AS $k1 => $v1) {
+            foreach ($levels as $k1 => $v1) {
                if (!empty($v1['level']) && !empty($v1['limit_day'])) {
                    $time = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $v1['limit_day']));
                    if ($k1 == 0) {
@ -1322,7 +1329,7 @@ class Customer extends Common
            $minLimit = $this->getMinDay($levels);
            $minTime = strtotime(date('Y-m-d 00:00:00', time() - 86400 * $minLimit));

-            $where .= "  OR ((ISNULL(`contract`.`customer_id`) AND !`customer`.`level` AND `customer`.`obtain_time` > ".$minTime.") OR (!`customer`.`level` AND `customer`.`obtain_time` > ".$minTime." AND `customer`.`obtain_time` > `contract`.`create_time`) OR (`contract`.`create_time` > ".$minTime." AND `contract`.`create_time` > `customer`.`obtain_time` AND !`customer`.`level`)) )";
+            $where .= "  OR ((ISNULL(`contract`.`customer_id`) AND ISNULL(`customer`.`level`) AND `customer`.`obtain_time` > " . $minTime . ") OR (ISNULL(`customer`.`level`) AND `customer`.`obtain_time` > " . $minTime . " AND `customer`.`obtain_time` > `contract`.`create_time`) OR (`contract`.`create_time` > " . $minTime . " AND `contract`.`create_time` > `customer`.`obtain_time` AND ISNULL(`customer`.`level`))) )";
        }

        # 选择不进入公海的客户（有商机客户）
@ -1342,10 +1349,10 @@ class Customer extends Common
            ->field(['customer.customer_id', 'customer.obtain_time AS customer_time', 'customer.level', 'contract.create_time AS contract_time'])
            ->join('__CRM_BUSINESS__ business', 'business.customer_id = customer.customer_id', 'LEFT')
            ->join('__CRM_CONTRACT__ contract', 'contract.customer_id = customer.customer_id', 'LEFT')
-            ->where($where)->select();
+            ->where($where)->where(['customer.crm_lthugd' => array('in', $customerType)])->select();

        # 计算到期天数
-        foreach ($data AS $k1 => $v1) {
+        foreach ($data as $k1 => $v1) {
            if ($type == 1) {
                $customerTime = !empty($v1['contract_time']) && $v1['contract_time'] > $v1['customer_time'] ? $v1['contract_time'] : $v1['customer_time'];
                $date = date('Y-m-d 00:00:00', ($customerTime + $limitDay['all'] * 86400) - $remainDay * 86400);
@ -1372,9 +1379,9 @@ class Customer extends Common

    /**
     * [今日进入客户池条件]
-     * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function getWhereByToday()
    {
@ -1438,9 +1445,9 @@ class Customer extends Common
     * @param int $userId 用户ID
     * @param int $isDeal 成交客户是否占用拥有客户数条件：1 占用 0 不占用
     * @param int $types 类型：1 拥有客户数，2 锁定客户数
-     * @author fanqi
-     * @since 2021-04-15
     * @return int
+     * @since 2021-04-15
+     * @author fanqi
     */
    public function getCountByHave($userId, $isDeal = 0, $types = 1)
    {
@ -1539,9 +1546,9 @@ class Customer extends Common

    /**
     * [客户成交新增数量]
-     * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function getAddDealSql($map)
    {
@ -1577,9 +1584,9 @@ class Customer extends Common

    /**
     * [客户统计sql]
-     * @author Michael_xu
     * @param
     * @return
+     * @author Michael_xu
     */
    public function getAddressCountBySql($map)
    {
--- a/application/crm/model/CustomerCheck.php
+++ b/application/crm/model/CustomerCheck.php
@ -23,7 +23,7 @@ class CustomerCheck extends Common
    /**
     * 待审核客户列表
     * @param  $request
-     * @return
+     * @return array
     */

    public function getDataList($request)
@ -34,6 +34,7 @@ class CustomerCheck extends Common
        $order_field = $request['order_field'];
        $order_type = $request['order_type'];
        $getCount = $request['getCount'];
+        $user_id = $request['user_id'];
        $customerCheckIdArray = $request['customerCheckIdArray']; // 待办事项提醒参数
        unset($request['scene_id']);
        unset($request['search']);
@ -52,8 +53,6 @@ class CustomerCheck extends Common
        $requestMap = $request['map'] ?: [];
        # getCount是代办事项传来的参数，代办事项不需要使用场景
        $sceneMap = [];
-
-
        $partMap = [];
        $teamMap = $requestMap['team_id'];
        //团队成员 高级筛选
@ -65,6 +64,11 @@ class CustomerCheck extends Common
            $map = $requestMap ? array_merge($sceneMap, $requestMap) : $sceneMap;
        }

+        // 权限
+        $readAuthIds = $userModel->getUserByPer('crm', 'customer', 'read');
+        $updateAuthIds = $userModel->getUserByPer('crm', 'customer', 'update');
+        $deleteAuthIds = $userModel->getUserByPer('crm', 'customer', 'delete');
+
        //排序
        if ($order_type && $order_field) {
            $order = $fieldModel->getOrderByFormtype('crm_customer_check', 'customer_check', $order_field, $order_type);
@ -84,18 +88,59 @@ class CustomerCheck extends Common
            return $data;
        }

+        $indexField = $fieldModel->getIndexField('crm_customer', $user_id, 1) ?: array('name'); // 列表展示字段
+        $userField = $fieldModel->getFieldByFormType('crm_customer', 'user'); // 人员类型
+        $structureField = $fieldModel->getFieldByFormType('crm_customer', 'structure'); // 部门类型
+        # 处理人员和部门类型的排序报错问题(前端传来的是包含_name的别名字段)
+        $temporaryField = str_replace('_name', '', $order_field);
+        if (in_array($temporaryField, $userField) || in_array($temporaryField, $structureField)) {
+            $order_field = $temporaryField;
+        }
+         $customerField = '';
+        foreach ($indexField as $k => $v) {
+            $customerField = 'customer.'.$v;
+        }
+
        $list = db('crm_customer_check')
            ->alias('customer_check')
-            ->join('__CRM_CUSTOMER__ customer', 'business.customer_id = customer.customer_id', 'LEFT')
+            ->join('__CRM_CUSTOMER__ customer', 'customer_check.customer_id = customer.customer_id', 'LEFT')
            ->where($map)
            ->where($partMap)
            ->where($dealtWhere)
            ->limit($request['offset'], $request['length'])
-            ->field('customer_check.*,customer.name as customer_name')
+            ->field('customer_check.*,customer.*')
            ->orderRaw($order)
            ->select();
-        # 扩展数据
-        $extraData = [];
+
+        foreach ($list as $k => $v) {
+            $list[$k]['customer_id_info']['customer_id'] = $v['customer_id'];
+            $list[$k]['customer_id_info']['name'] = $v['customer_name'];
+            $list[$k]['create_user_id_info'] = isset($v['create_user_id']) ? $userModel->getUserById($v['create_user_id']) : [];
+            $list[$k]['owner_user_id_info'] = isset($v['owner_user_id']) ? $userModel->getUserById($v['owner_user_id']) : [];
+            $list[$k]['create_user_name'] = !empty($list[$k]['create_user_id_info']['realname']) ? $list[$k]['create_user_id_info']['realname'] : '';
+            $list[$k]['owner_user_name'] = !empty($list[$k]['owner_user_id_info']['realname']) ? $list[$k]['owner_user_id_info']['realname'] : '';
+
+            //权限
+            $roPre = $userModel->rwPre($user_id, $v['ro_user_id'], $v['rw_user_id'], 'read');
+            $rwPre = $userModel->rwPre($user_id, $v['ro_user_id'], $v['rw_user_id'], 'update');
+            $permission = [];
+            $is_read = 0;
+            $is_update = 0;
+            $is_delete = 0;
+            if (in_array($v['owner_user_id'], $readAuthIds) || $roPre || $rwPre) $is_read = 1;
+            if (in_array($v['owner_user_id'], $updateAuthIds) || $rwPre) $is_update = 1;
+            if (in_array($v['owner_user_id'], $deleteAuthIds)) $is_delete = 1;
+            $permission['is_read'] = $is_read;
+            $permission['is_update'] = $is_update;
+            $permission['is_delete'] = $is_delete;
+            $list[$k]['permission'] = $permission;
+
+            # 日期
+            $list[$k]['create_time'] = !empty($v['create_time']) ? date('Y-m-d H:i:s', $v['create_time']) : null;
+            $list[$k]['update_time'] = !empty($v['update_time']) ? date('Y-m-d H:i:s', $v['update_time']) : null;
+            # 系统字段  负责人部门   zjf  20210726
+            $list[$k]['owner_user_structure_name'] = $list[$k]['owner_user_id_info']['structure_name'];
+        }
        $data = [];
        $data['list'] = $list ?: [];
        $data['dataCount'] = $dataCount ?: 0;
@ -119,6 +164,8 @@ class CustomerCheck extends Common
            $createData[$key]['check_user_id'] = $param['check_user_id'] ?? 0;
            $createData[$key]['flow_user_id'] = $param['flow_user_id'] ?? 0;
            $createData[$key]['user_id'] = $param['user_id'] ?? 0;
+            $createData[$key]['create_user_id'] = $param['user_id'] ?? 0;
+            $createData[$key]['owner_user_id'] = $param['user_id'] ?? 0;
        }

        $this->startTrans();
--- a/application/oa/logic/ExamineLogic.php
+++ b/application/oa/logic/ExamineLogic.php
@ -479,13 +479,13 @@ class ExamineLogic extends Common
                    ->where($where)
                    ->where($whereOr)
                    ->field(
-                        'a.customer_check_id as catagory_id ,customer.name as customer_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.customer_check_id as catagory_id ,customer.name as customer_name,a.create_time,a.check_status,a.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')
                    ->select();
                foreach ($list as $k => $v) {
-                    $list[$k]['create_user_info'] = $userModel->getUserById($v['create_user_id']);
+                    $list[$k]['create_user_info'] = $userModel->getUserById($v['user_id']);

                }
                $dataCount = db('crm_customer_check')
--- a/config/route_crm.php
+++ b/config/route_crm.php
@ -56,6 +56,8 @@ return [
    'crm/customer/poolAuthority' => ['crm/customer/poolAuthority', ['method' => 'POST']],
    // 【客户】级别列表
    'crm/customer/level' => ['crm/customer/level', ['method' => 'POST']],
+    // 【客户】类型列表
+    'crm/customer/type' => ['crm/customer/type', ['method' => 'POST']],

    // 【客户】公海列表
    'crm/customerPool/index' => ['crm/customerPool/index', ['method' => 'POST']],
@ -89,6 +91,8 @@ return [
    'crm/customerPool/setFieldWidth' => ['crm/customerPool/setFieldWidth', ['method' => 'POST']],
    // 【客户】设置公海字段配置
    'crm/customerPool/setFieldConfig' => ['crm/customerPool/setFieldConfig', ['method' => 'POST']],
+    // 【客户】总经理客户公海池消息
+    'crm/customerPool/num' => ['crm/customerPool/num', ['method' => 'POST']],

    // 【客户】回访
    'crm/visit/index' => ['crm/visit/index', ['method' => 'POST']],
@ -532,6 +536,7 @@ return [

    // 企业微信回调
    'crm/callback/index' => ['crm/callback/index', ['method' => 'POST|GET']],
+    'crm/callback/work' => ['crm/callback/work', ['method' => 'POST|GET']],

    // MISS路由
    '__miss__' => 'admin/base/miss',
Author	SHA1	Message	Date
戴余标	048ed843b8	bug修改	1 year ago
戴余标	8473cdc3d5	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	c158015019	Merge pull request '待进入公海提醒' (#47 ) from zm into master Reviewed-on: mengfucius/wkcrm#47	2 years ago
张萌	f9762a9069	待进入公海提醒	2 years ago
戴余标	7b67e58ea3	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	ed5cf68658	Merge pull request '公海回收bug fix' (#46 ) from zm into master Reviewed-on: mengfucius/wkcrm#46	2 years ago
张萌	6cee6d51db	公海回收bug fix	2 years ago
戴余标	add0179a2d	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	311f024b5a	Merge pull request '公海自动回收规则调整' (#45 ) from zm into master Reviewed-on: mengfucius/wkcrm#45	2 years ago
张萌	c1d7d65f03	公海自动回收规则调整	2 years ago
杨赟	b8650a1044	Merge pull request '修复' (#44 ) from yy-4.20 into master Reviewed-on: mengfucius/wkcrm#44	2 years ago
杨赟	8b2d951a88	修复	2 years ago
杨赟	216fd7dbf0	Merge pull request '修复' (#43 ) from yy-4.20 into master Reviewed-on: mengfucius/wkcrm#43	2 years ago
杨赟	c61dd5910e	修复	2 years ago
杨赟	6ebd628712	修复	2 years ago
杨赟	f76905042a	Merge pull request '修复' (#42 ) from yy-4.20 into master Reviewed-on: mengfucius/wkcrm#42	2 years ago
杨赟	15f8edc15f	修复	2 years ago
杨赟	ae8094a955	Merge pull request '修复' (#41 ) from yy-4.20 into master Reviewed-on: mengfucius/wkcrm#41	2 years ago
杨赟	7d9ff20d3d	修复	2 years ago
杨赟	b7cf5e96ff	Merge pull request '添加客户端' (#40 ) from yy-4.20 into master Reviewed-on: mengfucius/wkcrm#40	2 years ago
杨赟	ef0d5ea764	添加客户端	2 years ago
戴余标	ae5f35941d	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	7e63f7b86b	Merge pull request '客户领取问题修复' (#39 ) from zm into master Reviewed-on: mengfucius/wkcrm#39	2 years ago
张萌	7b0d8369fd	客户领取问题修复	2 years ago
戴余标	3d11da1077	ww	2 years ago
戴余标	0dc65dd447	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	1ef6ac4960	Merge pull request '列表展示字段' (#38 ) from zm into master Reviewed-on: mengfucius/wkcrm#38	2 years ago
张萌	cf444c5073	列表展示字段	2 years ago
戴余标	1c88bd4577	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	9b4ded5d2b	Merge pull request 'zm' (#37 ) from zm into master Reviewed-on: mengfucius/wkcrm#37	2 years ago
张萌	cdbc6abd87	字段修改	2 years ago
张萌	53adf43e91	手动放入公海	2 years ago
戴余标	85e7420e8f	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	ebd8a5e366	Merge pull request 'bug fix' (#35 ) from zm into master Reviewed-on: mengfucius/wkcrm#35	2 years ago
张萌	e9a082aa9a	bug fix	2 years ago
戴余标	311b51b802	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	9a69d54646	Merge pull request '公海客户类型配置调整' (#34 ) from zm into master Reviewed-on: mengfucius/wkcrm#34	2 years ago
张萌	b3e73fb1c5	公海客户类型配置调整	2 years ago
戴余标	a099d3104c	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	fa411cad4d	Merge pull request '客户类型公海设置' (#33 ) from zm into master Reviewed-on: mengfucius/wkcrm#33	2 years ago
张萌	ffdaba68e0	客户类型公海设置	2 years ago
戴余标	c8b8556c03	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	b58bbbef4b	Merge pull request 'bug fix' (#32 ) from zm into master Reviewed-on: mengfucius/wkcrm#32	2 years ago
张萌	820f6c8912	bug fix	2 years ago
戴余标	1e26559183	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	59eb058bc1	Merge pull request 'bug fix' (#31 ) from zm into master Reviewed-on: mengfucius/wkcrm#31	2 years ago
张萌	cfe6f030fc	bug fix	2 years ago
戴余标	a2329555c4	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	c57233837d	Merge pull request '销售漏斗' (#30 ) from zm into master Reviewed-on: mengfucius/wkcrm#30	2 years ago
张萌	f4e75bca13	销售漏斗	2 years ago
张萌	92aabd8f0e	Merge pull request '添加字段' (#29 ) from zm into master Reviewed-on: mengfucius/wkcrm#29	2 years ago
张萌	8ba1c99540	添加字段	2 years ago
戴余标	d9f299c3d4	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	1495e9f39f	Merge pull request 'zm' (#28 ) from zm into master Reviewed-on: mengfucius/wkcrm#28	2 years ago
戴余标	94fb7cb66d	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	226efc26cd	客户类型设置	2 years ago
张萌	34d8f76e74	标记已处理	2 years ago
张萌	ca3af5f387	新商机修复	2 years ago
张萌	f2f72b2fd5	Merge pull request '拒绝后再次审批' (#27 ) from zm into master Reviewed-on: mengfucius/wkcrm#27	2 years ago
张萌	597b5d2d3f	拒绝后再次审批	2 years ago
张萌	f4b3d06283	Merge pull request 'zm' (#26 ) from zm into master Reviewed-on: mengfucius/wkcrm#26	2 years ago
张萌	b6ec11bf2b	返回数据	2 years ago
戴余标	e0af6bb0e1	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	3a9b3fbb61	Merge pull request 'bug fix' (#25 ) from zm into master Reviewed-on: mengfucius/wkcrm#25	2 years ago
张萌	7c31cc34bf	bug fix	2 years ago
张萌	80d1af3d0d	bug fix	2 years ago
戴余标	fd94e68f87	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	aaf895df3f	Merge pull request '添加返回字段' (#24 ) from zm into master Reviewed-on: mengfucius/wkcrm#24	2 years ago
张萌	d8cb282c9f	添加返回字段	2 years ago
戴余标	fc563cd389	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	9c41c94b33	Merge pull request 'bug fix' (#23 ) from zm into master Reviewed-on: mengfucius/wkcrm#23	2 years ago
张萌	d157007b35	bug fix	2 years ago
张萌	4cc8915334	Merge pull request 'bug fix' (#22 ) from zm into master Reviewed-on: mengfucius/wkcrm#22	2 years ago
张萌	98083d9077	bug fix	2 years ago
戴余标	6b0964282c	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	6e9afbeed9	Merge pull request 'flow_id 解决' (#21 ) from zm into master Reviewed-on: mengfucius/wkcrm#21	2 years ago
张萌	cb1a21e799	flow_id 解决	2 years ago
戴余标	2eb28996dc	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	9e9fc2f798	Merge pull request '客户详情' (#20 ) from zm into master Reviewed-on: mengfucius/wkcrm#20	2 years ago
张萌	7148df93bf	客户详情	2 years ago
戴余标	c99fa001aa	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	b90464e037	Merge pull request 'zm' (#19 ) from zm into master Reviewed-on: mengfucius/wkcrm#19	2 years ago
张萌	4a74644a0e	新商机提醒	2 years ago
张萌	063c1a63b5	商机审批修改	2 years ago
戴余标	e124bd5089	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	be8ef58780	Merge pull request '返回数据修改' (#17 ) from zm into master Reviewed-on: mengfucius/wkcrm#17	2 years ago
张萌	809b786f7d	返回数据修改	2 years ago
戴余标	e5a96e620e	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	07926c46c3	Merge pull request '字段更改' (#16 ) from zm into master Reviewed-on: mengfucius/wkcrm#16	2 years ago
张萌	60ee0378aa	字段更改	2 years ago
戴余标	44dc883a4e	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	fa8ecd6c4a	Merge pull request 'bug fix' (#15 ) from zm into master Reviewed-on: mengfucius/wkcrm#15	2 years ago
张萌	23777c9d12	bug fix	2 years ago
戴余标	1351192db6	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	587783aba8	Merge pull request 'bug fix' (#14 ) from zm into master Reviewed-on: mengfucius/wkcrm#14	2 years ago
张萌	c82447283a	bug fix	2 years ago
戴余标	fcf7edc24f	Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm	2 years ago
张萌	d5684b44fd	Merge pull request 'bug fix' (#13 ) from zm into master Reviewed-on: mengfucius/wkcrm#13	2 years ago
张萌	8f3e7a1249	bug fix	2 years ago