更改bug

html/application/controllers/admin/distributionadmin.php

@@ -419,7 +419,7 @@ class Distributionadmin extends CI_Controller
 			$channelInfo=$query->result_array();
 
 			//查找此销管 绑定 此分销商的所有项目，并且不允许修改
-			$buildings = $this->building_distributor->get_has_building('R.user_id =' . $uid . ' and R.distributor_id = ' . $id);
+			$buildings = $this->building_distributor->get_has_building('R.distributor_id = ' . $id);
 
 			$this->data['buildings'] = $buildings;
 			$this->data['channelInfo']=$channelInfo;

html/application/controllers/admin/report.php

@@ -66,7 +66,7 @@ class Report extends CI_Controller
 	 * @version 2016-10-14
 	 */
 	public function index($page_no = 1)
-	{  
+	{
 // $this->load->model('sales_model','sales');
 //		$this->load->helper('eas');
 //	     	$api=new easApi;
@@ -82,7 +82,7 @@ class Report extends CI_Controller
 //                         }else{
 //                         	   $checksalesnum=$checksalesID['user_id'];
 //                         }
-//                         
+//
 //                  };
 //	     	     exit;
         $get = $this->input->get();
@@ -519,9 +519,9 @@ class Report extends CI_Controller
 				    foreach ($customerId as $value) {
 				    	       //获取接口返回值
                            $results = $api->newgetCustomerVisit(array('customer_id'=>$value['rongchuang_id']));
-                           if(!empty($results)){                               
+                           if(!empty($results)){
                	              $entity_id = $this->customer_building->get_building_id($value['id']);
-               	             
+
                	              $customerBuilding = $this->customer_building->get(array('id' => $entity_id['id']));
                	              //获取返回的sale_id
                	               $checksalesnum=array();
@@ -534,7 +534,7 @@ class Report extends CI_Controller
                                  if(!($customer_sales_id==$checksalesnum)){
                                  	 $this->customer_sales->delete_sale_id(array('customer_building_id'=>$customerBuilding['id']));
                                  	  foreach($checksalesnum as $checksales){
-                                 	  	
+
                                  	      $customersales['customer_building_id'] = $customerBuilding['id'];
                                  	      $customersales['sale_id'] = $checksales['sale_id'];
                                  	      $customersales['create_time'] = time();
@@ -562,7 +562,7 @@ class Report extends CI_Controller
                	              if($customerBuilding['recommend_status'] < 2){
                	              	$this->customer_building->update_customer_building($value['id'],array('recommend_status' => 2));
                	              	$customerBuilding['recommend_status']=2;
-               	              } 
+               	              }
                	              //记录客户跟进信息
                	              if ($customerBuilding) {
 						              $dataLog['user_id'] 			= $customerBuilding['user_id'];
@@ -1107,7 +1107,7 @@ class Report extends CI_Controller
 
 			if (!empty($manager_info) && $manager_info['role_id'] == '10')
 			{
-				$userInfo = $this->relate->get(array('user_id' => $manager_id, 'distributor_id' => $distributor_id, 'building_id' => $building_id));
+				$userInfo = $this->relate->get(array('distributor_id' => $distributor_id, 'building_id' => $building_id));
 
 				if (!$userInfo)
 				{