Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -553,10 +553,10 @@
         </if>
         <choose>
             <when test = "isBlack">
-                AND (fs_user.status = 1 and (fs_user_company_user.is_repeat_fans = 0 or fs_user_company_user.is_repeat_fans is null ))
+                AND (fs_user.status = 0 or fs_user_company_user.is_repeat_fans = 1)
             </when>
             <otherwise>
-                AND (fs_user.status = 1 and fs_user_company_user.is_repeat_fans = 0)
+                AND (fs_user.status = 1 and (fs_user_company_user.is_repeat_fans = 0 or fs_user_company_user.is_repeat_fans is null ))
             </otherwise>
         </choose>
         <if test="keyword != null and keyword !='' ">