[Gridmap] Query fix
这个提交包含在:
		
							父节点
							
								
									8deb34cee6
								
							
						
					
					
						当前提交
						60242ebbee
					
				
					共有  2 个文件被更改,包括 8 次插入 和 7 次删除
				
			
		|  | @ -14,11 +14,12 @@ class Gridmap extends CI_Controller { | ||||||
| 
 | 
 | ||||||
|         $data['modes'] = $this->gridmap_model->get_worked_modes(); |         $data['modes'] = $this->gridmap_model->get_worked_modes(); | ||||||
| 
 | 
 | ||||||
|  | 		 | ||||||
|         $data['bands'] = $this->bands->get_worked_bands(); |         $data['bands'] = $this->bands->get_worked_bands(); | ||||||
| 		 | 		 | ||||||
|         $footerData = []; |         $footerData = []; | ||||||
| 		$footerData['scripts'] = [ | 		$footerData['scripts'] = [ | ||||||
|             'assets/js/leaflet/L.MaidenheadColouredGridMap.js', | 			'assets/js/leaflet/L.MaidenheadColouredGridMap.js', | ||||||
| 			'assets/js/sections/gridmap.js?' | 			'assets/js/sections/gridmap.js?' | ||||||
| 		]; | 		]; | ||||||
| 		 | 		 | ||||||
|  | @ -246,7 +247,7 @@ class Gridmap extends CI_Controller { | ||||||
| 		} | 		} | ||||||
| 		$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl); | 		$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl); | ||||||
| 
 | 
 | ||||||
| 		if ($query && $query_vucc->num_rows() > 0) { | 		if ($query_vucc && $query_vucc->num_rows() > 0) { | ||||||
| 			foreach ($query_vucc->result() as $row) { | 			foreach ($query_vucc->result() as $row) { | ||||||
| 
 | 
 | ||||||
| 				$grids = explode(",", $row->COL_VUCC_GRIDS); | 				$grids = explode(",", $row->COL_VUCC_GRIDS); | ||||||
|  | @ -268,10 +269,10 @@ class Gridmap extends CI_Controller { | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		// Confirmed Squares
 | 		// // Confirmed Squares
 | ||||||
| 		$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl); | 		$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl); | ||||||
| 
 | 
 | ||||||
| 		if ($query && $query_vucc->num_rows() > 0) { | 		if ($query_vucc && $query_vucc->num_rows() > 0) { | ||||||
| 			foreach ($query_vucc->result() as $row) 			{ | 			foreach ($query_vucc->result() as $row) 			{ | ||||||
| 
 | 
 | ||||||
| 				$grids = explode(",", $row->COL_VUCC_GRIDS); | 				$grids = explode(",", $row->COL_VUCC_GRIDS); | ||||||
|  |  | ||||||
|  | @ -100,7 +100,7 @@ class Gridmap_model extends CI_Model { | ||||||
| 			$sql .= " and (col_mode ='" . $mode . "' or col_submode ='" . $mode . "')"; | 			$sql .= " and (col_mode ='" . $mode . "' or col_submode ='" . $mode . "')"; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         return $this->db->get($this->config->item('table_name')); |         return $this->db->query($sql); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     function get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl) { |     function get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl) { | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用