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

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

@@ -58,7 +58,7 @@
 											<div class="portlet-body form">
 												<!-- BEGIN FORM-->
 												<?php
-													//是否可读 
+													//是否可读
 													$is_disabled = isset($info['is_deleted']) && $info['is_deleted'] != 1 ? true : false;
 												?>
 												<form action="<?php echo site_url('admin/admin_api/ajax');?>" method="post"  class="form-horizontal">
@@ -87,9 +87,9 @@
 																	<div class="col-md-4">
 																		<input type="text" class="form-control" id="sort_num" name="sort_num" value="<?php echo isset($info['sort_num']) && !empty($info['sort_num'])? $info['sort_num'] : "";?>">
 																	</div>
-																	<div class="col-md-2">	
+																	<div class="col-md-2">
 																		<span class="help-block">
-																		（值越大越靠前）
+																		（1~30000,值越大越靠前）
 																		</span>
 																	</div>
 																</div>
@@ -129,7 +129,7 @@
 												<!-- END FORM-->
 											</div>
 										</div>
-									</div>								
+									</div>
 								</div>
 							</div>
 						</div>
@@ -165,11 +165,11 @@
             u_id = '<?php echo $this->session->userdata('u_id');?>',
             u_email = '<?php echo $this->session->userdata('email');?>';
             //thumb upload api
-            var thumb_upload_api = '';  
+            var thumb_upload_api = '';
 		</script>
 		<!-- END PAGE LEVEL SCRIPTS -->
 		<script>
-			jQuery(document).ready(function() {    
+			jQuery(document).ready(function() {
 			   	// initiate layout and plugins
 			   	App.init();
 			   	EcommerceProductsEdit.init();
@@ -206,4 +206,4 @@
 		<!-- END JAVASCRIPTS -->
 	</body>
 <!-- END BODY -->
-</html>
+</html>
\ No newline at end of file