change loctype to vvalue
This commit is contained in:
parent
4c2d4e55e4
commit
25dc76b7b9
@ -20,7 +20,7 @@ class Location extends Controller {
|
|||||||
$rows = $this->db->table('location l')
|
$rows = $this->db->table('location l')
|
||||||
->select("l.LocationID, LocCode, Parent, LocFull, LocType, v.VDesc ")
|
->select("l.LocationID, LocCode, Parent, LocFull, LocType, v.VDesc ")
|
||||||
->join("locationaddress la", "l.LocationID=la.LocationID", 'left')
|
->join("locationaddress la", "l.LocationID=la.LocationID", 'left')
|
||||||
->join("valueset v", "v.VSetID=12 and v.VID=l.loctype", 'left')
|
->join("valueset v", "v.VSetID=12 and v.VValue=l.loctype", 'left')
|
||||||
->get()->getResultArray();
|
->get()->getResultArray();
|
||||||
|
|
||||||
if (empty($rows)) {
|
if (empty($rows)) {
|
||||||
@ -42,7 +42,7 @@ class Location extends Controller {
|
|||||||
$rows = $this->db->table('location l')
|
$rows = $this->db->table('location l')
|
||||||
->select("l.*, la.*, v.*")
|
->select("l.*, la.*, v.*")
|
||||||
->join("locationaddress la", "l.LocationID=la.LocationID", "left")
|
->join("locationaddress la", "l.LocationID=la.LocationID", "left")
|
||||||
->join("valueset v", "v.VSetID=12 and v.VID=l.loctype", "left")
|
->join("valueset v", "v.VSetID=12 and v.VValue=l.loctype", "left")
|
||||||
->where('l.LocationID', (int) $LocationID)
|
->where('l.LocationID', (int) $LocationID)
|
||||||
->get()->getResultArray();
|
->get()->getResultArray();
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user