新增城市排序值问题，报表导出问题，渠道查看客户页面报错问题

html/application/controllers/admin/kpiadmin.php

@@ -356,7 +356,8 @@ class Kpiadmin extends CI_Controller
 
                 //我是销管
                 $user_id = (int)$this->session->userdata('u_id');
-                $where .= ' and R.user_id = ' . $user_id;
+								$buildings_select=$this->manager->get_buildings('id = ' . $user_id);
+								$where .= ' and B.id in (' . $buildings_select[0]['building_id'].')';
                 $where = trim($where, ' and ');
 
                 //获取客户总数
@@ -468,7 +469,8 @@ class Kpiadmin extends CI_Controller
 
                 if ($info['role_id'] == 10)
                 {
-                    $where .= ' and RR.user_id =' . $user_id;
+									$buildings_select=$this->manager->get_buildings('id = ' . $user_id);
+									$where .= ' and B.id in (' . $buildings_select[0]['building_id'].')';
                 } else if ($info['role_id'] == 11){
                     $where .= ' and D.manager_id =' . $user_id;
                 }

html/application/views/admin/channel/customerSearch.php

@@ -141,7 +141,7 @@
 											echo '完成';
 										}else if($customer['recommend_status']==7){
 											echo '认购';
-										}else if($customer['expired']==1){
+										}else if($customer['is_expired']==1){
 											echo '已过期';
 										}else if($customer['recommend_status']==9){
 											echo '可结俑';

html/application/views/admin/city/edit.php

@@ -89,7 +89,7 @@
 																	</div>
 																	<div class="col-md-2">
 																		<span class="help-block">
-																		（值越大越靠前）
+																		（1~30000,值越大越靠前）
 																		</span>
 																	</div>
 																</div>