显示端

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

@@ -44,6 +44,7 @@ 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()));
         }  
         }  
+        //MP
         if ((null != queryBean.getRegionCode()) && !("0").equals(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(",");
@@ -52,12 +53,17 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
         	}else {
         	}else {
         		criteria.add(Restrictions.eq("regionCode", queryBean.getRegionCode()));
         		criteria.add(Restrictions.eq("regionCode", queryBean.getRegionCode()));
         	}
         	}
+        	criteria.add(Restrictions.or(Restrictions.eq("showPaths", 2)
+            		,Restrictions.eq("showPaths", 3)));
         }
         }
+        
         if (null != queryBean.getVoucherType()&& !"".equals(queryBean.getVoucherType()) && 0 != 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()));
         } 
         } 
-        if (null != queryBean.getShowPaths()&& !"".equals(queryBean.getShowPaths()) && 0 != queryBean.getShowPaths()) {
-            criteria.add(Restrictions.eq("showPaths", queryBean.getShowPaths()));
+        // App
+        if (null == queryBean.getShowPaths()&& ("").equals(queryBean.getShowPaths()) && !("0").equals(queryBean.getShowPaths()) ) {        
+        	criteria.add(Restrictions.or(Restrictions.eq("showPaths", 1)
+            		,Restrictions.eq("showPaths", 3)));
         }
         }
         criteria.setFirstResult(queryBean.getPagerOffset());
         criteria.setFirstResult(queryBean.getPagerOffset());
         criteria.setMaxResults(queryBean.getPagerPerPage());
         criteria.setMaxResults(queryBean.getPagerPerPage());