Merge branch 'test-xq2' into test

src/main/resources/mapper/modules/partner/PartnerUserMapper.xml

@@ -722,23 +722,31 @@ SELECT
 
 
     <select id="selectJuniorListUser" resultType="com.ydtech.modules.partner.model.PartnerUser">
-        select id,user_id,`name`,grade from partner_user where grade = #{grade} AND referrer_id in
+        SELECT
+            p.id,
+            p.user_id,
+            p.`name`,
+            p.grade
+        FROM
+        partner_user p
+        LEFT JOIN sys_user u ON u.id = p.user_id
+                                       where u.status = 1 and p.grade = #{grade} AND p.referrer_id in
         <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
         <if test="params != null">
             <if test="params.timeFrame != null and params.timeFrame.length > 0">
-                AND create_time BETWEEN #{params.timeFrame[0]} AND #{params.timeFrame[1]}
+                AND p.create_time BETWEEN #{params.timeFrame[0]} AND #{params.timeFrame[1]}
             </if>
             <if test="params.countCycle != null">
                 <if test="params.countCycle == 'Day'">
-                    AND DATE(create_time) = CURDATE()
+                    AND DATE(p.create_time) = CURDATE()
                 </if>
                 <if test="params.countCycle == 'Week'">
-                    AND YEARWEEK(create_time, 1) = YEARWEEK(CURDATE(), 1)
+                    AND YEARWEEK(p.create_time, 1) = YEARWEEK(CURDATE(), 1)
                 </if>
                 <if test="params.countCycle == 'Month'">
-                    AND YEAR(create_time) = YEAR(CURDATE()) AND MONTH(create_time) = MONTH(CURDATE())
+                    AND YEAR(p.create_time) = YEAR(CURDATE()) AND MONTH(create_time) = MONTH(CURDATE())
                 </if>
             </if>
         </if>