Przeglądaj źródła

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 7 lat temu
rodzic
commit
4d956e8183

+ 3 - 0
src/main/java/com/goafanti/common/mapper/ExpertPublishMapper.xml

@@ -378,6 +378,9 @@ where 1=1
   	<if test="publishPlatform != null">
 		and ep.publish_platform = #{publishPlatform,jdbcType=VARCHAR}
 	</if>
+	<if test="publishPage != null">
+		and ep.publish_page = #{publishPage,jdbcType=VARCHAR}
+	</if>
 	<if test="publishClient != null">
 		and ep.publish_client = #{publishClient,jdbcType=INTEGER}
 	</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.102")) {
+		if (url.equals("localhost")||url.equals("168.1.101")) {
 			url="jishutao.com";
 		}
 		return marketingManagementMapper.selectMarketList(url,category,boothSize);

+ 1 - 1
src/main/java/com/goafanti/user/controller/ExpertPublishController.java

@@ -16,7 +16,7 @@ import com.goafanti.user.service.ExpertPublishService;
 import com.goafanti.user.service.UserService;
 
 @RestController
-@RequestMapping(value = "/api/admin/expert")
+@RequestMapping(value = "/open/api/admin/expert")
 public class ExpertPublishController extends BaseApiController {
 	@Resource
 	private UserService						userService;

+ 0 - 3
src/main/webapp/WEB-INF/views/portal/index.html

@@ -290,9 +290,6 @@
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>
 	</footer>
-	<div class="smg">
-		<input type="text" name="msg" value="" id="msg" />
-	</div>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/index.js'}"></script>