update

myapps/pc_management/api/machine_portal.py

@@ -47,7 +47,7 @@ def run_machine_list():
     where_sql = " "
     where_sql = " "
     if keyword:
     if keyword:
         where_sql += """
         where_sql += """
-                        and CONCAT(machine.machine_no,machine.qrcode_no) LIKE '%{keyword}%'
+                        and CONCAT(machine.machine_no,ifnull(machine.qrcode_no,'')) LIKE '%{keyword}%'
 
 
                             """.format(keyword=keyword)
                             """.format(keyword=keyword)
     order_sql = "  ORDER BY machine.id ASC, machine.status ASC"
     order_sql = "  ORDER BY machine.id ASC, machine.status ASC"
@@ -59,7 +59,7 @@ def run_machine_list():
         return BaseResponse(data={"list": [], "page": page, "pageSize": page_size, "total_count": 0})
         return BaseResponse(data={"list": [], "page": page, "pageSize": page_size, "total_count": 0})
     else:
     else:
         total_count = count_result.total_count
         total_count = count_result.total_count
-
+    print(select_sql + from_sql + where_sql + order_sql + limit_sql)
     result = db.session.execute(select_sql + from_sql + where_sql + order_sql + limit_sql).fetchall()
     result = db.session.execute(select_sql + from_sql + where_sql + order_sql + limit_sql).fetchall()
 
 
     return_data = []
     return_data = []