channeladmin 冲突提交

html/application/controllers/admin/channeladmin.php

@@ -137,6 +137,9 @@ class Channeladmin extends CI_Controller
 		$parentId=$this->input->post();
 		$edit_channel=$this->channel->get(array('id'=>$channelId));
 		$user = $this->manager->get(array('id'=>$edit_channel['manager_id']));
+		
+		$user_data=$this->session->userdata;
+		
 		$this->data['data']=$user;
 		if(!empty($parentId)){
 			if($parentId['parent_id']=='' && $parentId['manager_pwd']=='' && $parentId['ag_pwd']==''&& $parentId['region_id']=='' &&$parentId['building_id']==''){
@@ -186,7 +189,7 @@ class Channeladmin extends CI_Controller
 		} else {
 			$where="E.is_deleted = 0 order by convert(B.manager_name USING gbk) COLLATE gbk_chinese_ci asc";
 		}
-
+        
 		$re=$this->channel->find_channel_name($where);
 		// $this->db->select('A.id channel_id,B.manager_name channel_name')
 		// 	->from('tb_channel A')
@@ -195,7 +198,7 @@ class Channeladmin extends CI_Controller
 		// $query=$this->db->get();
 		// $re=$query->result_array();
 		$this->data['admins']=$re;
-
+    
 		$this->load->view('admin/channel/channelParent',$this->data);
 	}
 	/**

html/application/views/admin/sales/distributorAdd.php

@@ -89,7 +89,7 @@
                                                 <div class="col-md-8">
                                                     <?php if ($buildings) {
                                                         foreach ($buildings as $key => $build) { ?>
-                                                            <label style="width: 24%;float: right;">
+                                                            <label style="width: 24%;float: left;">
                                                                 <input type="checkbox" class="building_id" name="building_id[]" value="<?php echo $build['id']; ?>" <?php if($key == 0) { ?> checked="checked" <?php } ?>> <?php echo $build['building_title']; ?>
                                                             </label>
                                                         <?php }