Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -772,16 +772,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         fs_user
         LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
-        LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
         WHERE fs_user.is_del = 0 and fs_user_company_user.is_repeat_fans is not null
         <if test="userId != null and userId != 0 ">
-            and (fs_user_company_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+            and fs_user_company_user.company_user_id = #{userId}
         </if>
         <if test="companyId != null ">
             and fs_user_company_user.company_id = #{companyId}
         </if>
         GROUP BY
-        fs_user_company_user.`status`,fs_user_company_user.project_id
+        fs_user_company_user.`status`
     </select>
 
     <select id="getRepeatUserNumber" resultType="int">
@@ -790,9 +789,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         fs_user
         LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
-        LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
         WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        fs_user_company_user.company_user_id = #{userId}
         AND fs_user.is_del = 0
         AND fs_user_company_user.is_repeat_fans = 1 and fs_user.`status` = 1
     </select>