1

application/api_broker/controller/User.php

@@ -94,7 +94,6 @@ class User extends Basic
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
         #接口调用类型 0：客户搜索 1：全部客户 2:我的客户
         $app_request_source_type = isset($params["app_request_source_type"]) && is_numeric($params["app_request_source_type"])? $params["app_request_source_type"] : 1;
-
         $conditions = [];
 
         switch ($app_request_source_type) {
@@ -132,10 +131,11 @@ class User extends Basic
                 if (isset($params['user_status'])) {
                     $conditions['user_status'] = $params['user_status'];
                 }
-                if(isset($params['entrust_type']) &&  is_numeric($params['entrust_type']) && ($app_request_source_type == 1)){
+                if(isset($params['entrust_type']) &&  is_numeric($params['entrust_type'])){
                     //委托类型
                     $conditions['entrust_type'] =$params['entrust_type'];
                 }
+
                 break;
             default:
                 if (isset($params['user_status'])) {
@@ -249,8 +249,6 @@ class User extends Basic
 
         }
 
-
-        
         $field = "id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,
         price_demand,area_demand,vip,user_label,source_intro,site_ids,entrust_type,concrete_industry";
         $return_user_list = $this->userModel->selectUserList($field, $conditions, $pageNo, $pageSize, "id desc");

application/index/service/UserLogService.php

@@ -403,7 +403,7 @@ class  UserLogService
     {
         //查询客户详情
         $field = 'id as user_id,agent_id,vip,create_time,first_login_time,referrer_source,referrer_id,registration_time,
-        source_intro,referrer_source,source,entrust_type,concrete_industry';
+        source_intro,referrer_source,source,entrust_type,concrete_industry,industry_type';
         $user_result = $this->userModel->getUserDetailStreamline($user_id,$field);
 
         if (count($user_result) <= 0) {