Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

@@ -247,13 +247,13 @@
             <if test="educationalTeacherId!=null">
                 AND pg.educational_teacher_id_=#{educationalTeacherId}
             </if>
-            <if test="type != null and firstOrRenew == 1">
-                AND pg.be_renew_group_id_ IS NULL
+            <if test="type != null and type == 1">
+                AND pg.be_renew_group_id_ IS NULL AND pg.buy_months_ IS NOT NULL
             </if>
-            <if test="type != null and firstOrRenew == 0">
-                AND pg.be_renew_group_id_ IS NOT NULL
+            <if test="type != null and type == 0">
+                AND pg.be_renew_group_id_ IS NOT NULL AND pg.buy_months_ IS NOT NULL
             </if>
-            <if test="type != null and firstOrRenew == 2">
+            <if test="type != null and type == 2">
                 AND pg.buy_months_ IS NULL
             </if>
         </where>