seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/142/MERGE
13621160019@163.com 2022-03-24 21:18:57 +08:00
parent 301dff6f49 c964306999
commit 70dc82fc81
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myems-api/core/menu.py
View File

@ -205,7 +205,7 @@ class MenuWebCollection:
query = (" SELECT id, route, parent_menu_id " query = (" SELECT id, route, parent_menu_id "
" FROM tbl_menus " " FROM tbl_menus "
" WHERE parent_menu_id IS NULL AND is_hidden = false ") " WHERE parent_menu_id IS NULL AND is_hidden = 0 ")
cursor.execute(query) cursor.execute(query)
rows_menus = cursor.fetchall() rows_menus = cursor.fetchall()
@ -219,7 +219,7 @@ class MenuWebCollection:
query = (" SELECT id, route, parent_menu_id " query = (" SELECT id, route, parent_menu_id "
" FROM tbl_menus " " FROM tbl_menus "
" WHERE parent_menu_id IS NOT NULL AND is_hidden = false ") " WHERE parent_menu_id IS NOT NULL AND is_hidden = 0 ")
cursor.execute(query) cursor.execute(query)
rows_menus = cursor.fetchall() rows_menus = cursor.fetchall()

2
myems-modbus-tcp/acquisition.py
View File

@ -56,7 +56,7 @@ def process(logger, data_source_id, host, port):
try: try:
query = (" SELECT id, name, object_type, is_trend, ratio, address " query = (" SELECT id, name, object_type, is_trend, ratio, address "
" FROM tbl_points " " FROM tbl_points "
" WHERE data_source_id = %s AND is_virtual = FALSE " " WHERE data_source_id = %s AND is_virtual = 0 "
" ORDER BY id ") " ORDER BY id ")
cursor_system_db.execute(query, (data_source_id, )) cursor_system_db.execute(query, (data_source_id, ))
rows_point = cursor_system_db.fetchall() rows_point = cursor_system_db.fetchall()