diff --git a/app/tmnet_db_func.py b/app/tmnet_db_func.py index 6236719..07d7c3a 100644 --- a/app/tmnet_db_func.py +++ b/app/tmnet_db_func.py @@ -192,7 +192,8 @@ class TmnetDbHelper(TableDbHelperBase): """ conn, cursor = self.connect() try: - sql = """select IFNULL(clui.name, c2.name) as name, + sql = """select * from ( + select IFNULL(clui.name, c2.name) as name, c.crossid, IFNULL(clui.location, c.location) as location, c.nodeid, @@ -258,12 +259,12 @@ class TmnetDbHelper(TableDbHelperBase): join `user_defined_cross` udc on udc.crossid = c.crossid and udc.nodeid = %s and udc.area_id = %s 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""" + and c.area_id = %s) as t where t.src_direct is not NULL""" print(cursor.mogrify(sql, ( nodeid, area_id, nodeid, area_id, nodeid, nodeid, int(nodeid), int(area_id), nodeid, area_id, nodeid, area_id, nodeid, int(nodeid), int(area_id), nodeid, area_id, nodeid, nodeid, int(nodeid), int(area_id), - nodeid, nodeid, nodeid, int(nodeid), int(area_id)))) + nodeid, area_id, nodeid, int(nodeid), int(area_id)))) cursor.execute(sql, ( nodeid, area_id, nodeid, area_id, nodeid, nodeid, int(nodeid), int(area_id), nodeid, area_id, nodeid, area_id, nodeid, int(nodeid), int(area_id),