zhaoxian 3 سال پیش
والد
کامیت
2b9e2047a2

+ 4 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/material/mapper/xml/ProductMaterialMapper.xml

@@ -89,7 +89,7 @@
         </where>
         GROUP BY signature
         ) t2 ON t1.signature = t2.signature
-        LEFT JOIN (select id, realname from sys_user) t3 on t1.uploader_id =t3.id
+        LEFT JOIN (select id, realname from sys_user) t3 on t1.user_id =t3.id
         LEFT JOIN ( SELECT product_id, trade_name, sum(1)AS 'videoCount' FROM ctop_product_material
         WHERE video_url is not null
         GROUP BY product_id,trade_name) t4 ON t1.product_id = t4.product_id AND t1.trade_name= t4.trade_name
@@ -111,6 +111,7 @@
         </if>
         </where>
         group by t1.product_id,t1.trade_name
+        ORDER BY t1.create_time desc
     </select>
 
     <select id="videoListTotal" resultType="java.lang.Long">
@@ -149,6 +150,7 @@
           and trade_name = #{tradeName}
           and start_month >= #{startMonth}
           and end_month &lt;= #{endMonth}
+        ORDER BY t1.create_time desc
     </select>
 
     <select id="getVideoDetailsReportList" resultType="com.alibaba.fastjson.JSONObject">
@@ -197,6 +199,7 @@
         <if test="itemRun!=null">
             and t1.item_run = #{itemRun}
         </if>
+        ORDER BY t1.create_time desc
     </select>
 
 </mapper>