Merge branch 'wwr' into 'develop'

zhiweiu_fix

See merge request !31

unify_api/modules/zhiwei_u/dao/data_es_dao.py

@@ -82,7 +82,10 @@ async def get_search_scope(cid, pid, start, end):
     sql = f"select * from point_1min_event where {where_str} " \
           f"ORDER BY event_datetime desc limit 5000"
     async with MysqlUtil() as conn:
-        data = await conn.fetchall(sql, args=(cid,))
+        if cid:
+            data = await conn.fetchall(sql, args=(cid, ))
+        else:
+            data = await conn.fetchall(sql)
     return data