--no commit message

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

@@ -17,7 +17,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 	@Select("<script> "
 			+ " select tt.* from ("
 			+ "select m.id,account,name,status,phone,createTime,prizedate,"
-			+ " IFNULL(prizecount,0),case when IFNULL((select count(*) from m_member_priaze a where  a.memberid = m.id ),0) >0 then  '是' else '否' end isprize,"
+			+ " IFNULL(prizecount,0),case when IFNULL((select count(*) from m_member_priaze a where  a.memberid = m.id ),0) >0 then  '是' else '否' end isstues,"
 			+ " (select GROUP_CONCAT(prizename) from m_member_priaze a where  a.memberid = m.id ) prizename,"
 			+ " case when (select prizetype from m_member_priaze a where  a.memberid = m.id ORDER BY prizetype desc LIMIT 1) = 1 then '已领取' else '未领取'  end prizetype"
 			+ "  from m_member m where 1=1 and status != 2"
@@ -39,8 +39,8 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ "<if test = '"+NOTBLANK+"(form.prizename)' >"
 			+ " and tt.prizename = #{form.prizename}"
 			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(form.prizetype)' >"
-			+ " and tt.isprize = #{form.prizetype} "
+			+ "<if test = '"+NOTBLANK+"(form.isprize)' >"
+			+ " and tt.isprize = #{form.isprize} "
 			+ "</if>"
 			+ "<if test = '"+NOTBLANK+"(form.isstues)' >"
 			+ " and tt.prizetype = #{form.isstues} "