fix:bug

data_manage/public_analysis.py

@@ -546,7 +546,6 @@ def advertisement_rank(user_id, start, end, type, page, page_size, order, order_
     op11 = f" and order_count>0" if has_order else ''
     op12 = f" and is_video" if is_video else ''
     # 公共数据,和素材库一样,个人只显示个人(小组)数据
-    # TODO:之后op_or1 变化为owner来限制,------dw_image_cost_day 生成时就根据dt,cost来归类owner
     op_or1 = f' or (dt<date_add(now(),interval -5 day) or cost>5000) ' if show_type == 'public' else ''
     op_order = f" order by {order_by} {order}" if order_by and order else ''
 
@@ -583,7 +582,8 @@ def advertisement_rank(user_id, start, end, type, page, page_size, order, order_
     preview_url
     from dw_image_cost_day
     where replace (preview_url,' ,','') !='' 
-    and (1=1 {op1}  {op4} {op5} {op8} {op10} {op11}  {op12}  {op_or1}) 
+    and (1=1 {op1}  {op_or1})  
+    {op4} {op5} {op8} {op10} {op11}  {op12}  
     {op_time_bigger} {op_time_small} 
      {op_order} 
     """