Merge branch 'test-xq2' into test

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

@@ -906,8 +906,9 @@ SELECT
         COUNT(DISTINCT u.id)
         FROM
         partner_user u
+        LEFT JOIN sys_user su ON u.user_id = su.id
         LEFT JOIN sys_user_track  t ON u.user_id = t.user_id
-        WHERE u.referrer_id = #{userId} and u.grade = #{grade}
+        WHERE  su.`status` = 1 AND u.referrer_id = #{userId} and u.grade = #{grade}
         <if test="period.startDate != null and period.endDate != null">
             AND t.approve_time BETWEEN #{period.startDate} AND #{period.endDate}
         </if>