zoujiajian 2 rokov pred
rodič
commit
9ceb5a5a78

+ 12 - 2
netflix-dao/src/main/resources/mapper/UserDistributeRankStatisticsRecordMapper.xml

@@ -59,8 +59,18 @@
         udsr.reward
         from user_distribute_rank_statistics_record udsr
         left join user u on u.id = udsr.user_id
-        where statistics_start_time = #{date}
-        order by ${filed} desc limit 20)
+        <where>
+            <if test="date != null">
+                statistics_start_time = #{date}
+            </if>
+            <if test="userId != null">
+                udsr.user_id = #{userId}
+            </if>
+            <if test="nickname != null">
+                u.nickname like concat('%${nickname}%')
+            </if>
+        </where>
+        order by statistics_start_time desc, ${filed} desc limit 20)
         s
         <if test="orderBy!=null">
             order by ${orderBy} ${sort}

+ 1 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/active/UserActivityController.java

@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
+ * admin/分销排行
  * 项目名: yhlxj
  * 文件名: UserActivityController
  * 创建者: JavaZou