卷类型

src/main/java/com/ctrip/fun/golf/dao/product/BuyVoucherActivityDao.java

@@ -44,16 +44,16 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
         if (null != queryBean.getUserLimit()) {
         if (null != queryBean.getUserLimit()) {
             criteria.add(Restrictions.eq("userLimit", queryBean.getUserLimit()));
             criteria.add(Restrictions.eq("userLimit", queryBean.getUserLimit()));
         }  
         }  
-        if ((null != queryBean.getRegionCode())) {
+        if ((null != queryBean.getRegionCode()) && !("0").equals(queryBean.getRegionCode())) {
         	if(queryBean.getRegionCode().contains(",")){
         	if(queryBean.getRegionCode().contains(",")){
         		String[] split = queryBean.getRegionCode().split(",");
         		String[] split = queryBean.getRegionCode().split(",");
         		criteria.add(Restrictions.or(Restrictions.eq("regionCode", split[0])
         		criteria.add(Restrictions.or(Restrictions.eq("regionCode", split[0])
                 		,Restrictions.eq("regionCode", split[1])));
                 		,Restrictions.eq("regionCode", split[1])));
-        	}else if(0!= Integer.valueOf(queryBean.getRegionCode())){
+        	}else {
         		criteria.add(Restrictions.eq("regionCode", queryBean.getRegionCode()));
         		criteria.add(Restrictions.eq("regionCode", queryBean.getRegionCode()));
         	}        
         	}        
         } 
         } 
-        if (null != queryBean.getVoucherType()) {
+        if (null != queryBean.getVoucherType()&& !"".equals(queryBean.getVoucherType()) && 0 != queryBean.getVoucherType()) {
             criteria.add(Restrictions.eq("voucherType", queryBean.getVoucherType()));
             criteria.add(Restrictions.eq("voucherType", queryBean.getVoucherType()));
         } 
         } 
         criteria.setFirstResult(queryBean.getPagerOffset());
         criteria.setFirstResult(queryBean.getPagerOffset());

src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java

@@ -49,7 +49,7 @@ public class BuyVoucherActivity implements java.io.Serializable {
 	private String wishing;//祝福语
 	private String wishing;//祝福语
 	private BigDecimal grossPrice;// 毛利价
 	private BigDecimal grossPrice;// 毛利价
 	private String regionCode;  //区域   0-全区域,100-上海 ，110-广州，120-北京
 	private String regionCode;  //区域   0-全区域,100-上海 ，110-广州，120-北京
-	private Integer voucherType;//卷类型  0 -正常卷 1-体验卷需要身份证
+	private Integer voucherType;//卷类型 1 -正常卷 2-体验卷需要身份证