1

application/api_broker/controller/User.php

@@ -99,6 +99,8 @@ class User extends Basic
 
         switch ($app_request_source_type) {
             case 0:
+                $pageNo   = 1;
+                $pageSize = 50;
                 if (isset($params['id'])) {
                     $conditions['id'] = $params['id'];
                 }
@@ -132,7 +134,7 @@ 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'];
                 }
@@ -210,47 +212,30 @@ class User extends Basic
                     $conditions['vip'] = $params['is_vip'];
                 }
 
-                //传了经纪人id则表示我的客户
-                if (isset($params["agent_id"])) {
-                    $conditions['agent_id'] = $params['agent_id'];
-
-                    //是我的客户就显示全部
-                }else{
-                    if($app_request_source_type == 1){
-                        #全部客户列表 排除排除纯房东客户
-                        $conditions['user_label'] = array( "neq", 2 );
-                        #根据时间搜索，要能搜到保护期客户
-                        if(!$is_search  && !isset($conditions['create_time'])){
-                            #排除排除保护期内的客户 将截止日期大于当前时间的数据排除掉
-                            $time_now = date('Y-m-d H:i:s');
-                            $conditions['protect_time'] = array('lt',$time_now);
-                        }
-
-                        #站点的客户
-                        if (isset($params['site_id']) ) {
-                            #根据前端选择站点客户
-                            $conditions['site_ids'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
-                        }else{
-                            #前端不穿站点参数就默认显示经纪人所在站点的客户
-                            $conditions['site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
-                        }
-                    }
+                //全部客户列表 排除排除纯房东客户
+                $conditions['user_label'] = array( "neq", 2 );
+                //根据时间搜索，要能搜到保护期客户
+                if(!$is_search  && !isset($conditions['create_time'])){
+                    //排除排除保护期内的客户 将截止日期大于当前时间的数据排除掉
+                    $time_now = date('Y-m-d H:i:s');
+                    $conditions['protect_time'] = array('lt',$time_now);
                 }
 
-                if (($app_request_source_type == 0) && (!isset($params["agent_id"]))) {
-                    $pageNo   = 1;
-                    $pageSize = 50;
+                //客户站点
+                if (isset($params['site_id']) ) {
+                    $conditions['site_ids'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
+                }else{
+                    $conditions['site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
                 }
 
-                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'];
                 }
 
         }
 
 
-
         $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");
@@ -290,8 +275,7 @@ class User extends Basic
             $return_user_list[$k]['user_phone'] = substr_replace($return_user_list[$k]['user_phone'], '****', 3, 4);
 
             $return_user_list[$k]['site_ids_name'] = $user_service->userSiteName($v["site_ids"]);
-
-            $return_user_list[$k]['user_name'] = $v['user_name']?"[{$v['concrete_industry']}]{$v['user_name']}":'';
+            $return_user_list[$k]['user_name'] = $v['user_name'] && $v['entrust_type'] == 0 ?"[{$v['concrete_industry']}]{$v['user_name']}":$v['user_name'];
         }
 
 

application/index/controller/OfficeFinance.php

@@ -65,7 +65,7 @@ class OfficeFinance extends Basic
         $pageNo                    = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize                  = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
         $where                     = [];
-        $where['a.confirm_status'] = 1;
+        // $where['a.confirm_status'] = 1;
         $where['a.is_del']         = $select = 0;
         $where['b.status']         = ['in','10,11,13'];
 
@@ -120,9 +120,9 @@ class OfficeFinance extends Basic
             $select = 1;
         }
 
-        $field = 'a.id,b.id as bargain_id,f.income_time,a.practical_fee,b.scale_fee,s.address as internal_address';
-        $field .= ',b.agent_id,b.house_number,b.father_id,b.order_id,a.real_income_id,a.role,b.scale';
-        // $m_commission = new OPartialCommission();
+        big_log($where);
+        $field = 'a.id,b.id as bargain_id,f.income_time,a.practical_fee,b.scale_fee,s.address as internal_address,
+        b.agent_id,b.house_number,b.father_id,b.order_id,a.real_income_id,a.role,b.scale';
         $m_Office_commission = new OfficeOPartialCommission();
 
         try {

application/index/service/UserLogService.php

@@ -240,7 +240,7 @@ class  UserLogService
         if (count($result) <= 0) {
             return ["code" => 101, "msg" => "没找到此条用户信息"];
         }
-        $result['user_name'] = $result['user_name']?"[{$result['concrete_industry']}]{$result['user_name']}":'';
+        $result['user_name'] = $result['user_name']&& $result['entrust_type'] == 0 ?"[{$result['concrete_industry']}]{$result['user_name']}":$result['user_name'];
         $result['user_pic'] = !empty($result["user_pic"]) ? HEADERIMGURL . $result["user_pic"] : $result["other_pic"];
 
         #判断是否纯房东 0:否 1：是

application/model/OfficeOPartialCommission.php

@@ -37,7 +37,7 @@ class OfficeOPartialCommission extends BaseModel
             ->join("office_g_room r", "c.house_id = r.id", "left")
             ->join("office_g_building s", "r.building_id = s.id", "left")
             ->join('a_agents e', 'b.agent_id = e.id', 'left')
-            ->join('o_real_income f', 'a.real_income_id = f.id', 'left')
+            ->join('office_o_real_income f', 'a.real_income_id = f.id', 'left')
             ->where($where)
             ->order($order_)
             ->limit($pageSize)
@@ -126,7 +126,7 @@ class OfficeOPartialCommission extends BaseModel
             ->join("office_g_room r", "c.house_id = r.id", "left")
             ->join("office_g_building s", "r.building_id = s.id", "left")
             ->join('a_agents e', 'b.agent_id = e.id', 'left')
-            ->join('o_real_income f', 'a.real_income_id = f.id', 'left')
+            ->join('office_o_real_income f', 'a.real_income_id = f.id', 'left')
             ->where($where)
             ->count();
     }