Merge branch 'dev' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into dev

Service/MiscellService.py

@@ -72,16 +72,17 @@ class MyserviceDynamodb():
         try:
             table = dynamodb.Table(table_name)
             response = table.scan(
-                FilterExpression=Attr('userID').eq(values)
+                FilterExpression = Attr('userID').eq(values)
                                  | Key('ip').eq(values)
                                  | Key('status').eq(values)
                                  | Key('content').eq(values)
                                  | Key('operation').eq(values)
             )
+            items = response['Items']
+            return items
         except Exception as e:
             logger.error("Failed to get table {0}, error".format(table_name, e))
-        items = response['Items']
-        return  items
+            return []
 
     # 时间段搜索
     def get_item_time(self, table_name, start_date, end_date):