diff --git a/app/tmnet_db_func.py b/app/tmnet_db_func.py index 9719f5d..305782f 100644 --- a/app/tmnet_db_func.py +++ b/app/tmnet_db_func.py @@ -206,7 +206,7 @@ class TmnetDbHelper(TableDbHelperBase): join `cross` c2 on c2.crossid = c.crossid and c2.nodeid = %s and c2.area_id = %s left join `cross_ledger_update_info` as clui on clui.crossid = c.crossid and clui.nodeid = %s and clui.area_id = %s left join `road` as r on r.nodeid = %s and r.to_crossid = c.crossid and r.recordstate = 0 and (r.is_sup_road is null or r.is_sup_road <> 1) - left join `road_ledger_update_info` as rlui on rlui.nodeid = %s and rlui.recordstate = r.recordstate and rlui.to_crossid = r.to_crossid and (rlui.is_sup_road is null or rlui.is_sup_road <> 1) + left join `road_ledger_update_info` as rlui on rlui.roadid = r.roadid and rlui.nodeid = %s and rlui.recordstate = r.recordstate and rlui.to_crossid = r.to_crossid and (rlui.is_sup_road is null or rlui.is_sup_road <> 1) left join `user_defined_roads` as udr on udr.nodeid = %s and udr.recordstate = 0 and udr.to_crossid = c2.crossid and (udr.is_sup_road is null or udr.is_sup_road <> 1) where c.nodeid = %s and c.area_id = %s @@ -224,7 +224,7 @@ class TmnetDbHelper(TableDbHelperBase): from `bound_crosses` as c join `user_defined_cross` udc on udc.crossid = c.crossid and udc.nodeid = %s and udc.area_id = %s left join `road` as r on r.nodeid = %s and r.to_crossid = udc.crossid and r.recordstate = 0 and (r.is_sup_road is null or r.is_sup_road <> 1) - left join `road_ledger_update_info` as rlui on rlui.nodeid = %s and rlui.recordstate = 0 and rlui.to_crossid = r.to_crossid and (rlui.is_sup_road is null or rlui.is_sup_road <> 1) + left join `road_ledger_update_info` as rlui on rlui.roadid = r.roadid and rlui.nodeid = %s and rlui.recordstate = 0 and rlui.to_crossid = r.to_crossid and (rlui.is_sup_road is null or rlui.is_sup_road <> 1) left join `user_defined_roads` as udr on udr.nodeid = %s and udr.recordstate = 0 and udr.to_crossid = c.crossid and (udr.is_sup_road is null or udr.is_sup_road <> 1) where c.nodeid = %s and c.area_id = %s"""