--no commit message

app/member/src/main/java/com/zrqx/member/bg/member/mapper/MemberMapper.java

@@ -17,8 +17,12 @@ public interface MemberMapper extends BaseMapper<Member>{
 	String DEFAULT_PARAM = " like(m.account,form.account) "
 			+ " like(m.phone,form.phone) "
 			+ " eq(m.status,form.status) "
+			+"<if test='form.vip==0 || form.vip==1'>"
 			+ " eq(pm.vip,form.vip) "
-			
+			+ "</if>"
+			+"<if test='form.vip==3'>"
+			+ " eq(pm.orderType,form.vip) "
+			+ "</if>"
 			+ "<if test = '"+NOTBLANK+"(form.beginTime)' >"
 			+ "<![CDATA["
 			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{form.beginTime} "
@@ -30,7 +34,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ "]]>"
 			+ "</if>";
 	
-	String DEFAULT_SQL = " select m.id,m.account,m.status,m.phone,m.level,m.createTime,,(case when pm.vip = 1 then 1 when pm.orderType = 3 then 3 when  pm.vip = 0 then 0  end ) vip,pm.endTime "
+	String DEFAULT_SQL = " select m.id,m.account,m.status,m.phone,m.level,m.createTime,(case when pm.vip = 1 then 1 when pm.orderType = 3 then 3 when  pm.vip = 0 then 0  end ) vip,pm.endTime "
 			+ " from m_member m left join m_personal_member pm on m.id = pm.id "
 			+ " where status != 2 and level = 0 ";