Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

anderx 7 years ago
parent
commit
12a4725cbe

+ 9 - 0
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -401,6 +401,15 @@ where x.audit_status = 3
 	    and ep.publish_page='W01'
 	    and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
 	</if>
+	<if test="category == 1">
+	order by ap.if_top,ap.top_number,ap.show_number asc
+	</if>
+	<if test="category == 2">
+	order by dp.if_top,dp.top_number,dp.show_number asc
+	</if>
+	<if test="category == 7">
+	order by ep.if_top,ep.top_number,ep.show_number asc
+	</if>
 	<if test="boothSize !=null">
 		LIMIT 0, #{boothSize,jdbcType=VARCHAR}
 	</if>

+ 1 - 1
src/main/java/com/goafanti/marketing/service/impl/MarketingManagementServiceImpl.java

@@ -49,7 +49,7 @@ public class MarketingManagementServiceImpl implements MarketingManagementServic
 	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,Integer category,Integer boothSize) {
 		String url=res.getServerName();
 		url=url.substring(url.indexOf(".")+1, url.length());
-		if (url.equals("localhost")||url.equals("168.1.104")) {
+		if (url.equals("localhost")||url.equals("168.1.102")) {
 			url="jishutao.com";
 		}
 		return marketingManagementMapper.selectMarketList(url,category,boothSize);