Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -556,6 +556,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
                 hasSeven = true;
                 studyRec.setCourseType(17);
+                return true;
             }
         }
         UserVo userVo = iUserService.queryById(bo.getUserId());

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -278,18 +278,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="hasBindWx != null and hasBindWx == 0 ">
             AND u.union_id is null
         </if>
-        <if test="hasFollowWx != null and hasFollowWx == 1 ">
-            AND uwf.gzh_open_id is not null
-        </if>
-        <if test="hasFollowWx != null and hasFollowWx == 0 ">
-            AND uwf.gzh_open_id is null
-        </if>
-        <if test="lastVisitPlat != null ">
-            AND uvl.visit_from_plat = #{lastVisitPlat}
-        </if>
-        <if test="lastStudyPlat != null ">
-            AND usl.study_from_plat = #{lastStudyPlat}
-        </if>
         <if test="visitStartTime != null and visitStartTime !=''">
             and (SELECT
             count(*)