Merge branch 'master' of https://git.okayapps.com/lihengyi/sunac-quanmin

* 'master' of https://git.okayapps.com/lihengyi/sunac-quanmin:
  更改案场分配后历史记录无销售

html/application/models/customer_building_log_model.php

@@ -112,7 +112,9 @@ class Customer_building_log_model extends MY_Model{
     	->from('tb_customer_building_log CB')
     	->join('tb_building B', 'B.id= CB.building_id', 'left')
     	->join('tb_customer TC', 'TC.id = CB.customer_id', 'left')
-    	->join('tb_user US', 'US.id=CB.sale_id', 'left')
+    	->join('tb_customer_building SB','SB.customer_id = CB.customer_id','left')
+    	->join('tb_customer_sales CS','CS.customer_building_id = SB.id','left')
+    	->join('tb_user US', 'US.id=CS.sale_id', 'left')
     	->join('tb_user UM', 'UM.id = CB.manager_id', 'left')
     	->join('tb_user UU', 'UU.id = CB.user_id', 'left')
     	->join('tb_distributor D', 'D.uniqid_id=UU.uniqid_id', 'left');