Merge remote-tracking branch 'origin/master'

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

@@ -891,15 +891,16 @@ SELECT
 
     <select id="selectNumber" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM (
-             SELECT
-                 p.user_id,
-                 p.grade,
-                 p.referrer_id,
-                 u.`status`,
-        ( SELECT t.partner_review_time FROM sys_user_jzg_info_salesman t WHERE t.sys_user_jzg_info_id = u.id ORDER BY t.partner_review_time LIMIT 1 )  approve_time
-            FROM partner_user p
-        	LEFT JOIN sys_user_jzg_info u ON u.id = p.user_id
-        WHERE p.referrer_id = #{userId} AND p.grade = #{number}
+            SELECT
+            p.user_id,
+            p.grade,
+            p.referrer_id,
+            sa.partner_status,
+            sa.partner_review_time AS approve_time
+            FROM
+            partner_user p
+            LEFT JOIN sys_user_jzg_info_salesman sa ON p.user_id = sa.sys_user_jzg_info_id
+        WHERE  sa.type_attr = 3 AND sa.partner_status = 3 AND p.referrer_id = #{userId} AND p.grade = #{number}
                 <if test="param != null and param != ''">
                     AND p.user_id != #{param}
                 </if>