From 7841c0a9b2ab772d9712d461237be7848a224a5b Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Fri, 20 Sep 2019 11:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=BF=E5=91=8A=E6=8C=89ga?=
 =?UTF-8?q?meid=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/ad.py | 67 +++++++++++----------------------------------------
 1 file changed, 14 insertions(+), 53 deletions(-)

diff --git a/handler/ad.py b/handler/ad.py
index 906f766..4263deb 100644
--- a/handler/ad.py
+++ b/handler/ad.py
@@ -49,62 +49,14 @@ class Ad(Resource):
 		status = self.args['status']
 		id = self.args['id']
 		companyid = self.args['companyid']
+		gameid = self.args['gameid']
 		# if not gameid or not localid:
 		# 	# log.error(f"请输入必须的游戏ID和位置ID字段，当前获得是{gameid},{localid}")
 		# 	return jsonify({'code': 500, "message": f"请输入必须的游戏ID和位置ID字段，当前获得是{gameid},{localid},{status}"})
 
 		# now = datetime.datetime.today().strftime("%Y-%m-%d %H:%M:%S")
 		if not id:
-			if companyid:
-				sel_sql = f"""select
-				    id,
-				    name,
-				    begin_time,
-				    end_time,
-				    ad_num,
-				    ad_title,
-				    ad_body,
-				    ad_image,
-				    jump_param,
-				    ad_sort,
-				    status,
-				    companyid,
-				    locationid,
-				    gameid,
-				    channelid,
-				    jump_status,
-					ad_property
-				from
-				    ad 
-				where
-				     in_used=1 
-				    and companyid={companyid};"""
-			elif status or status == 0:
-				sel_sql = f"""select
-								    id,
-								    name,
-								    begin_time,
-								    end_time,
-								    ad_num,
-								    ad_title,
-								    ad_body,
-								    ad_image,
-								    jump_param,
-								    ad_sort,
-								    status,
-								    companyid,
-								    locationid,
-								    gameid,
-								    channelid,
-								    jump_status,
-									ad_property
-								from
-								    ad 
-								where
-								     in_used=1 
-								    and status={status};"""
-			else:
-				sel_sql = f"""select
+			base_sql = """SELECT
 							    id,
 							    name,
 							    begin_time,
@@ -122,10 +74,19 @@ class Ad(Resource):
 							    channelid,
 							    jump_status,
 								ad_property
-							from
+							FROM
 							    ad 
-							where
-							     in_used=1 ;"""
+							WHERE
+							     in_used=1 """
+
+			if companyid:
+				sel_sql = f"{base_sql} and companyid={companyid}"
+			else:
+				sel_sql = f"{base_sql}"
+			if status:
+				sel_sql = f"{sel_sql} and status={status}"
+			if gameid:
+				sel_sql = f"{sel_sql} and gameid={gameid}"
 		else:
 			sel_sql = f"""select
 						    id,